Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
4e701d69
Commit
4e701d69
authored
Apr 23, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a VRT_CTX arg to vdir_new(), we will need it
parent
a99c21d7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
6 deletions
+8
-6
fall_back.c
lib/libvmod_directors/fall_back.c
+1
-1
hash.c
lib/libvmod_directors/hash.c
+1
-1
random.c
lib/libvmod_directors/random.c
+1
-1
round_robin.c
lib/libvmod_directors/round_robin.c
+1
-1
vdir.c
lib/libvmod_directors/vdir.c
+2
-1
vdir.h
lib/libvmod_directors/vdir.h
+2
-1
No files found.
lib/libvmod_directors/fall_back.c
View file @
4e701d69
...
...
@@ -98,7 +98,7 @@ vmod_fallback__init(VRT_CTX,
ALLOC_OBJ
(
fb
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
AN
(
fb
);
*
fbp
=
fb
;
vdir_new
(
&
fb
->
vd
,
"fallback"
,
vcl_name
,
vmod_fallback_healthy
,
vdir_new
(
ctx
,
&
fb
->
vd
,
"fallback"
,
vcl_name
,
vmod_fallback_healthy
,
vmod_fallback_resolve
,
fb
);
fb
->
st
=
sticky
;
}
...
...
lib/libvmod_directors/hash.c
View file @
4e701d69
...
...
@@ -59,7 +59,7 @@ vmod_hash__init(VRT_CTX, struct vmod_directors_hash **rrp,
ALLOC_OBJ
(
rr
,
VMOD_DIRECTORS_HASH_MAGIC
);
AN
(
rr
);
*
rrp
=
rr
;
vdir_new
(
&
rr
->
vd
,
"hash"
,
vcl_name
,
NULL
,
NULL
,
rr
);
vdir_new
(
ctx
,
&
rr
->
vd
,
"hash"
,
vcl_name
,
NULL
,
NULL
,
rr
);
}
VCL_VOID
v_matchproto_
()
...
...
lib/libvmod_directors/random.c
View file @
4e701d69
...
...
@@ -86,7 +86,7 @@ vmod_random__init(VRT_CTX, struct vmod_directors_random **rrp,
ALLOC_OBJ
(
rr
,
VMOD_DIRECTORS_RANDOM_MAGIC
);
AN
(
rr
);
*
rrp
=
rr
;
vdir_new
(
&
rr
->
vd
,
"random"
,
vcl_name
,
vmod_random_healthy
,
vdir_new
(
ctx
,
&
rr
->
vd
,
"random"
,
vcl_name
,
vmod_random_healthy
,
vmod_random_resolve
,
rr
);
}
...
...
lib/libvmod_directors/round_robin.c
View file @
4e701d69
...
...
@@ -95,7 +95,7 @@ vmod_round_robin__init(VRT_CTX,
ALLOC_OBJ
(
rr
,
VMOD_DIRECTORS_ROUND_ROBIN_MAGIC
);
AN
(
rr
);
*
rrp
=
rr
;
vdir_new
(
&
rr
->
vd
,
"round-robin"
,
vcl_name
,
vmod_rr_healthy
,
vdir_new
(
ctx
,
&
rr
->
vd
,
"round-robin"
,
vcl_name
,
vmod_rr_healthy
,
vmod_rr_resolve
,
rr
);
}
...
...
lib/libvmod_directors/vdir.c
View file @
4e701d69
...
...
@@ -50,11 +50,12 @@ vdir_expand(struct vdir *vd, unsigned n)
}
void
vdir_new
(
struct
vdir
**
vdp
,
const
char
*
name
,
const
char
*
vcl_name
,
vdir_new
(
VRT_CTX
,
struct
vdir
**
vdp
,
const
char
*
name
,
const
char
*
vcl_name
,
vdi_healthy_f
*
healthy
,
vdi_resolve_f
*
resolve
,
void
*
priv
)
{
struct
vdir
*
vd
;
AN
(
ctx
);
AN
(
name
);
AN
(
vcl_name
);
AN
(
vdp
);
...
...
lib/libvmod_directors/vdir.h
View file @
4e701d69
...
...
@@ -41,7 +41,8 @@ struct vdir {
struct
vbitmap
*
vbm
;
};
void
vdir_new
(
struct
vdir
**
vdp
,
const
char
*
name
,
const
char
*
vcl_name
,
void
vdir_new
(
VRT_CTX
,
struct
vdir
**
vdp
,
const
char
*
name
,
const
char
*
vcl_name
,
vdi_healthy_f
*
healthy
,
vdi_resolve_f
*
resolve
,
void
*
priv
);
void
vdir_delete
(
struct
vdir
**
vdp
);
void
vdir_rdlock
(
struct
vdir
*
vd
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment