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
9c4e8c8d
Commit
9c4e8c8d
authored
Jan 27, 2017
by
Guillaume Quintard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make vdir_remove_backend return void
parent
ca42915c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
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
+3
-4
vdir.h
lib/libvmod_directors/vdir.h
+1
-1
No files found.
lib/libvmod_directors/fall_back.c
View file @
9c4e8c8d
...
...
@@ -123,7 +123,7 @@ vmod_fallback_remove_backend(VRT_CTX,
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
fb
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
(
void
)
vdir_remove_backend
(
fb
->
vd
,
be
);
vdir_remove_backend
(
fb
->
vd
,
be
);
}
VCL_BACKEND
__match_proto__
()
...
...
lib/libvmod_directors/hash.c
View file @
9c4e8c8d
...
...
@@ -91,7 +91,7 @@ vmod_hash_remove_backend(VRT_CTX,
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
rr
,
VMOD_DIRECTORS_HASH_MAGIC
);
(
void
)
vdir_remove_backend
(
rr
->
vd
,
be
);
vdir_remove_backend
(
rr
->
vd
,
be
);
}
VCL_BACKEND
__match_proto__
()
...
...
lib/libvmod_directors/random.c
View file @
9c4e8c8d
...
...
@@ -118,7 +118,7 @@ VCL_VOID vmod_random_remove_backend(VRT_CTX,
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
rr
,
VMOD_DIRECTORS_RANDOM_MAGIC
);
(
void
)
vdir_remove_backend
(
rr
->
vd
,
be
);
vdir_remove_backend
(
rr
->
vd
,
be
);
}
VCL_BACKEND
__match_proto__
()
...
...
lib/libvmod_directors/round_robin.c
View file @
9c4e8c8d
...
...
@@ -127,7 +127,7 @@ vmod_round_robin_remove_backend(VRT_CTX,
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
rr
,
VMOD_DIRECTORS_ROUND_ROBIN_MAGIC
);
(
void
)
vdir_remove_backend
(
rr
->
vd
,
be
);
vdir_remove_backend
(
rr
->
vd
,
be
);
}
VCL_BACKEND
__match_proto__
()
...
...
lib/libvmod_directors/vdir.c
View file @
9c4e8c8d
...
...
@@ -133,14 +133,14 @@ vdir_add_backend(struct vdir *vd, VCL_BACKEND be, double weight)
return
(
u
);
}
unsigne
d
voi
d
vdir_remove_backend
(
struct
vdir
*
vd
,
VCL_BACKEND
be
)
{
unsigned
u
,
n
;
CHECK_OBJ_NOTNULL
(
vd
,
VDIR_MAGIC
);
if
(
be
==
NULL
)
return
(
vd
->
n_backend
)
;
return
;
CHECK_OBJ
(
be
,
DIRECTOR_MAGIC
);
vdir_wrlock
(
vd
);
for
(
u
=
0
;
u
<
vd
->
n_backend
;
u
++
)
...
...
@@ -148,7 +148,7 @@ vdir_remove_backend(struct vdir *vd, VCL_BACKEND be)
break
;
if
(
u
==
vd
->
n_backend
)
{
vdir_unlock
(
vd
);
return
(
vd
->
n_backend
)
;
return
;
}
vd
->
total_weight
-=
vd
->
weight
[
u
];
n
=
(
vd
->
n_backend
-
u
)
-
1
;
...
...
@@ -156,7 +156,6 @@ vdir_remove_backend(struct vdir *vd, VCL_BACKEND be)
memmove
(
&
vd
->
weight
[
u
],
&
vd
->
weight
[
u
+
1
],
n
*
sizeof
(
vd
->
weight
[
0
]));
vd
->
n_backend
--
;
vdir_unlock
(
vd
);
return
(
vd
->
n_backend
);
}
unsigned
...
...
lib/libvmod_directors/vdir.h
View file @
9c4e8c8d
...
...
@@ -48,7 +48,7 @@ void vdir_rdlock(struct vdir *vd);
void
vdir_wrlock
(
struct
vdir
*
vd
);
void
vdir_unlock
(
struct
vdir
*
vd
);
unsigned
vdir_add_backend
(
struct
vdir
*
,
VCL_BACKEND
be
,
double
weight
);
unsigne
d
vdir_remove_backend
(
struct
vdir
*
,
VCL_BACKEND
be
);
voi
d
vdir_remove_backend
(
struct
vdir
*
,
VCL_BACKEND
be
);
unsigned
vdir_any_healthy
(
struct
vdir
*
,
const
struct
busyobj
*
,
double
*
changed
);
VCL_BACKEND
vdir_pick_be
(
struct
vdir
*
,
double
w
,
const
struct
busyobj
*
);
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