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
6f63b8ef
Commit
6f63b8ef
authored
Aug 06, 2019
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Flexelinting: Macros named _something are reserved for the compiler
parent
338550ed
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
28 deletions
+28
-28
cache_ban.h
bin/varnishd/cache/cache_ban.h
+10
-10
cache_ban_build.c
bin/varnishd/cache/cache_ban_build.c
+3
-3
vmod_shard.c
lib/libvmod_directors/vmod_shard.c
+15
-15
No files found.
bin/varnishd/cache/cache_ban.h
View file @
6f63b8ef
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
#define BANS_FLAG_NODEDUP (1<<5)
#define BANS_FLAG_NODEDUP (1<<5)
#define BANS_OPER_EQ 0x10
#define BANS_OPER_EQ 0x10
#define
_BANS_OPER_OFF
BANS_OPER_EQ
#define
BANS_OPER_OFF_
BANS_OPER_EQ
#define BANS_OPER_NEQ 0x11
#define BANS_OPER_NEQ 0x11
#define BANS_OPER_MATCH 0x12
#define BANS_OPER_MATCH 0x12
#define BANS_OPER_NMATCH 0x13
#define BANS_OPER_NMATCH 0x13
...
@@ -85,14 +85,14 @@
...
@@ -85,14 +85,14 @@
#define BANS_OPER_GTE 0x15
#define BANS_OPER_GTE 0x15
#define BANS_OPER_LT 0x16
#define BANS_OPER_LT 0x16
#define BANS_OPER_LTE 0x17
#define BANS_OPER_LTE 0x17
#define
_BANS_OPER_LIM
(BANS_OPER_LTE + 1)
#define
BANS_OPER_LIM_
(BANS_OPER_LTE + 1)
#define BAN_OPERIDX(x) ((x) -
_BANS_OPER_OFF
)
#define BAN_OPERIDX(x) ((x) -
BANS_OPER_OFF_
)
#define BAN_OPERARRSZ (
_BANS_OPER_LIM - _BANS_OPER_OFF
)
#define BAN_OPERARRSZ (
BANS_OPER_LIM_ - BANS_OPER_OFF_
)
#define ASSERT_BAN_OPER(x) assert((x) >=
_BANS_OPER_OFF && (x) < _BANS_OPER_LIM
)
#define ASSERT_BAN_OPER(x) assert((x) >=
BANS_OPER_OFF_ && (x) < BANS_OPER_LIM_
)
#define BANS_ARG_URL 0x18
#define BANS_ARG_URL 0x18
#define
_BANS_ARG_OFF
BANS_ARG_URL
#define
BANS_ARG_OFF_
BANS_ARG_URL
#define BANS_ARG_REQHTTP 0x19
#define BANS_ARG_REQHTTP 0x19
#define BANS_ARG_OBJHTTP 0x1a
#define BANS_ARG_OBJHTTP 0x1a
#define BANS_ARG_OBJSTATUS 0x1b
#define BANS_ARG_OBJSTATUS 0x1b
...
@@ -100,11 +100,11 @@
...
@@ -100,11 +100,11 @@
#define BANS_ARG_OBJAGE 0x1d
#define BANS_ARG_OBJAGE 0x1d
#define BANS_ARG_OBJGRACE 0x1e
#define BANS_ARG_OBJGRACE 0x1e
#define BANS_ARG_OBJKEEP 0x1f
#define BANS_ARG_OBJKEEP 0x1f
#define
_
BANS_ARG_LIM (BANS_ARG_OBJKEEP + 1)
#define BANS_ARG_LIM (BANS_ARG_OBJKEEP + 1)
#define BAN_ARGIDX(x) ((x) -
_BANS_ARG_OFF
)
#define BAN_ARGIDX(x) ((x) -
BANS_ARG_OFF_
)
#define BAN_ARGARRSZ (
_BANS_ARG_LIM - _BANS_ARG_OFF
)
#define BAN_ARGARRSZ (
BANS_ARG_LIM - BANS_ARG_OFF_
)
#define ASSERT_BAN_ARG(x) assert((x) >=
_BANS_ARG_OFF && (x) < _
BANS_ARG_LIM)
#define ASSERT_BAN_ARG(x) assert((x) >=
BANS_ARG_OFF_ && (x) <
BANS_ARG_LIM)
// has an arg1_spec (BANS_FLAG_HTTP at build time)
// has an arg1_spec (BANS_FLAG_HTTP at build time)
#define BANS_HAS_ARG1_SPEC(arg) \
#define BANS_HAS_ARG1_SPEC(arg) \
...
...
bin/varnishd/cache/cache_ban_build.c
View file @
6f63b8ef
...
@@ -206,7 +206,7 @@ ban_parse_oper(const char *p)
...
@@ -206,7 +206,7 @@ ban_parse_oper(const char *p)
for
(
i
=
0
;
i
<
BAN_OPERARRSZ
;
i
++
)
{
for
(
i
=
0
;
i
<
BAN_OPERARRSZ
;
i
++
)
{
if
(
!
strcmp
(
p
,
ban_oper
[
i
]))
if
(
!
strcmp
(
p
,
ban_oper
[
i
]))
return
(
_BANS_OPER_OFF
+
i
);
return
(
BANS_OPER_OFF_
+
i
);
}
}
return
(
-
1
);
return
(
-
1
);
}
}
...
@@ -251,7 +251,7 @@ BAN_AddTest(struct ban_proto *bp,
...
@@ -251,7 +251,7 @@ BAN_AddTest(struct ban_proto *bp,
}
}
op
=
ban_parse_oper
(
a2
);
op
=
ban_parse_oper
(
a2
);
if
(
op
<
_BANS_OPER_OFF
||
if
(
op
<
BANS_OPER_OFF_
||
((
1U
<<
BAN_OPERIDX
(
op
))
&
arg_opervalid
[
BAN_ARGIDX
(
pv
->
tag
)])
==
0
)
((
1U
<<
BAN_OPERIDX
(
op
))
&
arg_opervalid
[
BAN_ARGIDX
(
pv
->
tag
)])
==
0
)
return
(
ban_error
(
bp
,
return
(
ban_error
(
bp
,
"expected conditional (%s) got
\"
%s
\"
"
,
"expected conditional (%s) got
\"
%s
\"
"
,
...
@@ -424,7 +424,7 @@ BAN_Build_Init(void) {
...
@@ -424,7 +424,7 @@ BAN_Build_Init(void) {
struct
vsb
*
vsb
=
VSB_new_auto
();
struct
vsb
*
vsb
=
VSB_new_auto
();
int
i
;
int
i
;
for
(
i
=
_BANS_ARG_OFF
;
i
<
_
BANS_ARG_LIM
;
i
++
)
{
for
(
i
=
BANS_ARG_OFF_
;
i
<
BANS_ARG_LIM
;
i
++
)
{
VSB_clear
(
vsb
);
VSB_clear
(
vsb
);
ban_build_arg_operhelp
(
vsb
,
i
);
ban_build_arg_operhelp
(
vsb
,
i
);
AZ
(
VSB_finish
(
vsb
));
AZ
(
VSB_finish
(
vsb
));
...
...
lib/libvmod_directors/vmod_shard.c
View file @
6f63b8ef
...
@@ -93,11 +93,11 @@
...
@@ -93,11 +93,11 @@
#define arg_healthy ((uint32_t)1 << 6)
#define arg_healthy ((uint32_t)1 << 6)
#define arg_param ((uint32_t)1 << 7)
#define arg_param ((uint32_t)1 << 7)
#define arg_resolve ((uint32_t)1 << 8)
#define arg_resolve ((uint32_t)1 << 8)
#define
_arg_mask
((arg_resolve << 1) - 1)
#define
arg_mask_
((arg_resolve << 1) - 1)
/* allowed in shard_param.set */
/* allowed in shard_param.set */
#define
_arg_mask_set
(arg_param - 1)
#define
arg_mask_set_
(arg_param - 1)
/* allowed in shard_param */
/* allowed in shard_param */
#define
_arg_mask_param ( _arg_mask_set
\
#define
arg_mask_param_ ( arg_mask_set_
\
& ~arg_key \
& ~arg_key \
& ~arg_key_blob )
& ~arg_key_blob )
...
@@ -143,7 +143,7 @@ static const struct vmod_directors_shard_param shard_param_default = {
...
@@ -143,7 +143,7 @@ static const struct vmod_directors_shard_param shard_param_default = {
.
defaults
=
NULL
,
.
defaults
=
NULL
,
.
scope
=
SCOPE_VMOD
,
.
scope
=
SCOPE_VMOD
,
.
mask
=
_arg_mask_param
,
.
mask
=
arg_mask_param_
,
.
by
=
BY_HASH
,
.
by
=
BY_HASH
,
.
healthy
=
CHOSEN
,
.
healthy
=
CHOSEN
,
.
rampup
=
1
,
.
rampup
=
1
,
...
@@ -429,13 +429,13 @@ shard_param_merge(struct vmod_directors_shard_param *to,
...
@@ -429,13 +429,13 @@ shard_param_merge(struct vmod_directors_shard_param *to,
const
struct
vmod_directors_shard_param
*
from
)
const
struct
vmod_directors_shard_param
*
from
)
{
{
CHECK_OBJ_NOTNULL
(
to
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
CHECK_OBJ_NOTNULL
(
to
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
assert
((
to
->
mask
&
~
_arg_mask_param
)
==
0
);
assert
((
to
->
mask
&
~
arg_mask_param_
)
==
0
);
if
(
to
->
mask
==
_arg_mask_param
)
if
(
to
->
mask
==
arg_mask_param_
)
return
;
return
;
CHECK_OBJ_NOTNULL
(
from
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
CHECK_OBJ_NOTNULL
(
from
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
assert
((
from
->
mask
&
~
_arg_mask_param
)
==
0
);
assert
((
from
->
mask
&
~
arg_mask_param_
)
==
0
);
if
((
to
->
mask
&
arg_by
)
==
0
&&
(
from
->
mask
&
arg_by
)
!=
0
)
{
if
((
to
->
mask
&
arg_by
)
==
0
&&
(
from
->
mask
&
arg_by
)
!=
0
)
{
to
->
by
=
from
->
by
;
to
->
by
=
from
->
by
;
...
@@ -457,7 +457,7 @@ shard_param_merge(struct vmod_directors_shard_param *to,
...
@@ -457,7 +457,7 @@ shard_param_merge(struct vmod_directors_shard_param *to,
to
->
mask
|=
from
->
mask
;
to
->
mask
|=
from
->
mask
;
if
(
to
->
mask
==
_arg_mask_param
)
if
(
to
->
mask
==
arg_mask_param_
)
return
;
return
;
AN
(
from
->
defaults
);
AN
(
from
->
defaults
);
...
@@ -495,7 +495,7 @@ shard_blob_key(VCL_BLOB key_blob)
...
@@ -495,7 +495,7 @@ shard_blob_key(VCL_BLOB key_blob)
#define tobit(args, name) ((args)->valid_##name ? arg_##name : 0)
#define tobit(args, name) ((args)->valid_##name ? arg_##name : 0)
static
uint32_t
static
uint32_t
shard_backend
_arg_mask
(
const
struct
VARGS
(
shard_backend
)
*
const
a
)
shard_backend
arg_mask_
(
const
struct
VARGS
(
shard_backend
)
*
const
a
)
{
{
return
(
tobit
(
a
,
by
)
|
return
(
tobit
(
a
,
by
)
|
tobit
(
a
,
key
)
|
tobit
(
a
,
key
)
|
...
@@ -535,7 +535,7 @@ shard_param_args(VRT_CTX,
...
@@ -535,7 +535,7 @@ shard_param_args(VRT_CTX,
CHECK_OBJ_NOTNULL
(
p
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
CHECK_OBJ_NOTNULL
(
p
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
AN
(
p
->
vcl_name
);
AN
(
p
->
vcl_name
);
assert
((
args
&
~
_arg_mask_set
)
==
0
);
assert
((
args
&
~
arg_mask_set_
)
==
0
);
by
=
(
args
&
arg_by
)
?
parse_by_e
(
by_s
)
:
BY_HASH
;
by
=
(
args
&
arg_by
)
?
parse_by_e
(
by_s
)
:
BY_HASH
;
healthy
=
(
args
&
arg_healthy
)
?
parse_healthy_e
(
healthy_s
)
:
CHOSEN
;
healthy
=
(
args
&
arg_healthy
)
?
parse_healthy_e
(
healthy_s
)
:
CHOSEN
;
...
@@ -631,7 +631,7 @@ shard_param_args(VRT_CTX,
...
@@ -631,7 +631,7 @@ shard_param_args(VRT_CTX,
if
(
args
&
arg_healthy
)
if
(
args
&
arg_healthy
)
p
->
healthy
=
healthy
;
p
->
healthy
=
healthy
;
p
->
mask
=
args
&
_arg_mask_param
;
p
->
mask
=
args
&
arg_mask_param_
;
return
(
p
);
return
(
p
);
}
}
...
@@ -643,11 +643,11 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
...
@@ -643,11 +643,11 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
struct
vmod_directors_shard_param
*
pp
=
NULL
;
struct
vmod_directors_shard_param
*
pp
=
NULL
;
const
struct
vmod_directors_shard_param
*
ppt
;
const
struct
vmod_directors_shard_param
*
ppt
;
enum
resolve_e
resolve
;
enum
resolve_e
resolve
;
uint32_t
args
=
shard_backend
_arg_mask
(
a
);
uint32_t
args
=
shard_backend
arg_mask_
(
a
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
vshard
,
VMOD_SHARD_SHARD_MAGIC
);
CHECK_OBJ_NOTNULL
(
vshard
,
VMOD_SHARD_SHARD_MAGIC
);
assert
((
args
&
~
_arg_mask
)
==
0
);
assert
((
args
&
~
arg_mask_
)
==
0
);
if
(
args
&
arg_resolve
)
if
(
args
&
arg_resolve
)
resolve
=
parse_resolve_e
(
a
->
resolve
);
resolve
=
parse_resolve_e
(
a
->
resolve
);
...
@@ -703,7 +703,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
...
@@ -703,7 +703,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
}
}
pp
=
shard_param_args
(
ctx
,
pp
,
"shard.backend()"
,
pp
=
shard_param_args
(
ctx
,
pp
,
"shard.backend()"
,
args
&
_arg_mask_set
,
args
&
arg_mask_set_
,
a
->
by
,
a
->
key
,
a
->
key_blob
,
a
->
alt
,
a
->
warmup
,
a
->
by
,
a
->
key
,
a
->
key_blob
,
a
->
alt
,
a
->
warmup
,
a
->
rampup
,
a
->
healthy
);
a
->
rampup
,
a
->
healthy
);
if
(
pp
==
NULL
)
if
(
pp
==
NULL
)
...
@@ -987,7 +987,7 @@ vmod_shard_param_set(VRT_CTX, struct vmod_directors_shard_param *p,
...
@@ -987,7 +987,7 @@ vmod_shard_param_set(VRT_CTX, struct vmod_directors_shard_param *p,
{
{
uint32_t
args
=
shard_param_set_mask
(
a
);
uint32_t
args
=
shard_param_set_mask
(
a
);
assert
((
args
&
~
_arg_mask_set
)
==
0
);
assert
((
args
&
~
arg_mask_set_
)
==
0
);
p
=
shard_param_prep
(
ctx
,
p
,
"shard_param.set()"
);
p
=
shard_param_prep
(
ctx
,
p
,
"shard_param.set()"
);
if
(
p
==
NULL
)
if
(
p
==
NULL
)
...
...
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