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
4ac43023
Commit
4ac43023
authored
Apr 29, 2019
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FlexeLinting: Be more careful about signed/unsigned
parent
3d170c0d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 deletions
+16
-15
shard_cfg.c
lib/libvmod_directors/shard_cfg.c
+2
-2
shard_dir.c
lib/libvmod_directors/shard_dir.c
+3
-3
shard_dir.h
lib/libvmod_directors/shard_dir.h
+2
-2
vmod_shard.c
lib/libvmod_directors/vmod_shard.c
+9
-8
No files found.
lib/libvmod_directors/shard_cfg.c
View file @
4ac43023
...
@@ -370,7 +370,7 @@ shardcfg_backend_lookup(const struct backend_reconfig *re,
...
@@ -370,7 +370,7 @@ shardcfg_backend_lookup(const struct backend_reconfig *re,
static
void
static
void
shardcfg_backend_expand
(
const
struct
backend_reconfig
*
re
)
shardcfg_backend_expand
(
const
struct
backend_reconfig
*
re
)
{
{
unsigned
min
=
re
->
hint
;
int
min
=
re
->
hint
;
CHECK_OBJ_NOTNULL
(
re
->
shardd
,
SHARDDIR_MAGIC
);
CHECK_OBJ_NOTNULL
(
re
->
shardd
,
SHARDDIR_MAGIC
);
...
@@ -380,7 +380,7 @@ shardcfg_backend_expand(const struct backend_reconfig *re)
...
@@ -380,7 +380,7 @@ shardcfg_backend_expand(const struct backend_reconfig *re)
if
(
re
->
shardd
->
l_backend
<
min
)
if
(
re
->
shardd
->
l_backend
<
min
)
re
->
shardd
->
l_backend
=
min
;
re
->
shardd
->
l_backend
=
min
;
else
else
re
->
shardd
->
l_backend
<<=
1
;
re
->
shardd
->
l_backend
*=
2
;
re
->
shardd
->
backend
=
realloc
(
re
->
shardd
->
backend
,
re
->
shardd
->
backend
=
realloc
(
re
->
shardd
->
backend
,
re
->
shardd
->
l_backend
*
sizeof
*
re
->
shardd
->
backend
);
re
->
shardd
->
l_backend
*
sizeof
*
re
->
shardd
->
backend
);
...
...
lib/libvmod_directors/shard_dir.c
View file @
4ac43023
...
@@ -319,15 +319,15 @@ sharddir_any_healthy(VRT_CTX, struct sharddir *shardd, VCL_TIME *changed)
...
@@ -319,15 +319,15 @@ sharddir_any_healthy(VRT_CTX, struct sharddir *shardd, VCL_TIME *changed)
{
{
unsigned
retval
=
0
;
unsigned
retval
=
0
;
VCL_BACKEND
be
;
VCL_BACKEND
be
;
unsigned
u
;
int
i
;
vtim_real
c
;
vtim_real
c
;
CHECK_OBJ_NOTNULL
(
shardd
,
SHARDDIR_MAGIC
);
CHECK_OBJ_NOTNULL
(
shardd
,
SHARDDIR_MAGIC
);
sharddir_rdlock
(
shardd
);
sharddir_rdlock
(
shardd
);
if
(
changed
!=
NULL
)
if
(
changed
!=
NULL
)
*
changed
=
0
;
*
changed
=
0
;
for
(
u
=
0
;
u
<
shardd
->
n_backend
;
u
++
)
{
for
(
i
=
0
;
i
<
shardd
->
n_backend
;
i
++
)
{
be
=
shardd
->
backend
[
u
].
backend
;
be
=
shardd
->
backend
[
i
].
backend
;
CHECK_OBJ_NOTNULL
(
be
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
be
,
DIRECTOR_MAGIC
);
retval
=
VRT_Healthy
(
ctx
,
be
,
&
c
);
retval
=
VRT_Healthy
(
ctx
,
be
,
&
c
);
if
(
changed
!=
NULL
&&
c
>
*
changed
)
if
(
changed
!=
NULL
&&
c
>
*
changed
)
...
...
lib/libvmod_directors/shard_dir.h
View file @
4ac43023
...
@@ -76,8 +76,8 @@ struct sharddir {
...
@@ -76,8 +76,8 @@ struct sharddir {
pthread_rwlock_t
mtx
;
pthread_rwlock_t
mtx
;
unsigned
n_backend
;
int
n_backend
;
unsigned
l_backend
;
int
l_backend
;
struct
shard_backend
*
backend
;
struct
shard_backend
*
backend
;
const
char
*
name
;
const
char
*
name
;
...
...
lib/libvmod_directors/vmod_shard.c
View file @
4ac43023
...
@@ -471,7 +471,7 @@ shard_blob_key(VCL_BLOB key_blob)
...
@@ -471,7 +471,7 @@ shard_blob_key(VCL_BLOB key_blob)
{
{
uint8_t
k
[
4
]
=
{
0
};
uint8_t
k
[
4
]
=
{
0
};
const
uint8_t
*
b
;
const
uint8_t
*
b
;
in
t
i
,
ki
;
size_
t
i
,
ki
;
AN
(
key_blob
);
AN
(
key_blob
);
AN
(
key_blob
->
blob
);
AN
(
key_blob
->
blob
);
...
@@ -762,8 +762,9 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
...
@@ -762,8 +762,9 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
VCL_DURATION
rampup_d
,
d
;
VCL_DURATION
rampup_d
,
d
;
VCL_BACKEND
be
;
VCL_BACKEND
be
;
VCL_BOOL
h
;
VCL_BOOL
h
;
unsigned
u
,
nh
=
0
;
unsigned
nh
=
0
;
double
rampup_p
;
double
rampup_p
;
int
i
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
dir
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
dir
,
DIRECTOR_MAGIC
);
...
@@ -785,8 +786,8 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
...
@@ -785,8 +786,8 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
}
}
sharddir_rdlock
(
shardd
);
sharddir_rdlock
(
shardd
);
for
(
u
=
0
;
u
<
shardd
->
n_backend
;
u
++
)
{
for
(
i
=
0
;
i
<
shardd
->
n_backend
;
i
++
)
{
sbe
=
&
shardd
->
backend
[
u
];
sbe
=
&
shardd
->
backend
[
i
];
AN
(
sbe
);
AN
(
sbe
);
be
=
sbe
->
backend
;
be
=
sbe
->
backend
;
CHECK_OBJ_NOTNULL
(
be
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
be
,
DIRECTOR_MAGIC
);
...
@@ -801,7 +802,7 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
...
@@ -801,7 +802,7 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
continue
;
continue
;
d
=
ctx
->
now
-
c
;
d
=
ctx
->
now
-
c
;
rampup_d
=
shardcfg_get_rampup
(
shardd
,
u
);
rampup_d
=
shardcfg_get_rampup
(
shardd
,
i
);
if
(
!
h
)
{
if
(
!
h
)
{
rampup_p
=
0
.
0
;
rampup_p
=
0
.
0
;
rampup_d
=
0
.
0
;
rampup_d
=
0
.
0
;
...
@@ -814,7 +815,7 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
...
@@ -814,7 +815,7 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
}
}
if
(
jflag
)
{
if
(
jflag
)
{
if
(
u
)
if
(
i
)
VSB_cat
(
vsb
,
",
\n
"
);
VSB_cat
(
vsb
,
",
\n
"
);
VSB_printf
(
vsb
,
"
\"
%s
\"
: {
\n
"
,
VSB_printf
(
vsb
,
"
\"
%s
\"
: {
\n
"
,
be
->
vcl_name
);
be
->
vcl_name
);
...
@@ -852,10 +853,10 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
...
@@ -852,10 +853,10 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
return
;
return
;
if
(
jflag
)
if
(
jflag
)
VSB_printf
(
vsb
,
"[%u, %
u,
\"
%s
\"
]"
,
nh
,
u
,
VSB_printf
(
vsb
,
"[%u, %
d,
\"
%s
\"
]"
,
nh
,
i
,
nh
?
"healthy"
:
"sick"
);
nh
?
"healthy"
:
"sick"
);
else
else
VSB_printf
(
vsb
,
"%u/%
u
\t
%s"
,
nh
,
u
,
nh
?
"healthy"
:
"sick"
);
VSB_printf
(
vsb
,
"%u/%
d
\t
%s"
,
nh
,
i
,
nh
?
"healthy"
:
"sick"
);
}
}
VCL_VOID
v_matchproto_
(
td_directors_shard_backend
)
VCL_VOID
v_matchproto_
(
td_directors_shard_backend
)
...
...
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