Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-vslp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
libvmod-vslp
Commits
d4dc46ed
Commit
d4dc46ed
authored
Jun 09, 2016
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hash_string() should be a function, not a method
parent
b7d9d4f7
Pipeline
#12
skipped
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
24 deletions
+24
-24
v01004.vtc
src/tests/v01004.vtc
+5
-5
v01005.vtc
src/tests/v01005.vtc
+1
-1
v01006.vtc
src/tests/v01006.vtc
+1
-1
v01007.vtc
src/tests/v01007.vtc
+1
-1
vmod_vslp.c
src/vmod_vslp.c
+14
-15
vmod_vslp.vcc
src/vmod_vslp.vcc
+2
-1
No files found.
src/tests/v01004.vtc
View file @
d4dc46ed
...
@@ -32,21 +32,21 @@ varnish v1 -vcl+backend {
...
@@ -32,21 +32,21 @@ varnish v1 -vcl+backend {
}
}
sub recv_sub {
sub recv_sub {
set req.backend_hint = vd.backend(hash=v
d
.hash_string(req.http.X-Hash, RS));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string(req.http.X-Hash, RS));
}
}
sub vcl_recv {
sub vcl_recv {
if(req.url == "/1") {
if(req.url == "/1") {
set req.backend_hint = vd.backend(hash=v
d
.hash_string("/eishoSu2"));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string("/eishoSu2"));
} else if (req.url == "/2") {
} else if (req.url == "/2") {
set req.backend_hint = vd.backend(hash=v
d
.hash_string(alg=SHA256, string="/eishoSu2"));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string(alg=SHA256, string="/eishoSu2"));
} else if (req.url == "/3") {
} else if (req.url == "/3") {
set req.http.X-Hash = "/oob3dahS";
set req.http.X-Hash = "/oob3dahS";
call recv_sub;
call recv_sub;
} else if (req.url == "/null_by_string") {
} else if (req.url == "/null_by_string") {
set req.backend_hint = vd.backend(hash=v
d
.hash_string(req.http.NonExistent));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string(req.http.NonExistent));
} else if (req.url == "/null_by_string_hash") {
} else if (req.url == "/null_by_string_hash") {
set req.backend_hint = vd.backend(hash=v
d
.hash_string(req.http.NonExistent, SHA256));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string(req.http.NonExistent, SHA256));
}
}
return(pass);
return(pass);
}
}
...
...
src/tests/v01005.vtc
View file @
d4dc46ed
...
@@ -40,7 +40,7 @@ varnish v1 -vcl+backend {
...
@@ -40,7 +40,7 @@ varnish v1 -vcl+backend {
}
}
sub vcl_recv {
sub vcl_recv {
set req.backend_hint = vd.backend(hash=v
d
.hash_string("/eishoSu2"));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string("/eishoSu2"));
if(req.url == "/2" && req.restarts > 0) {
if(req.url == "/2" && req.restarts > 0) {
unset req.http.vrstart;
unset req.http.vrstart;
}
}
...
...
src/tests/v01006.vtc
View file @
d4dc46ed
...
@@ -28,7 +28,7 @@ varnish v1 -vcl+backend {
...
@@ -28,7 +28,7 @@ varnish v1 -vcl+backend {
}
}
sub vcl_recv {
sub vcl_recv {
set req.backend_hint = vd.backend(hash=v
d
.hash_string("/eishoSu2"));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string("/eishoSu2"));
return(pass);
return(pass);
}
}
...
...
src/tests/v01007.vtc
View file @
d4dc46ed
...
@@ -31,7 +31,7 @@ varnish v1 -vcl+backend {
...
@@ -31,7 +31,7 @@ varnish v1 -vcl+backend {
}
}
sub vcl_recv {
sub vcl_recv {
set req.backend_hint = vd.backend(hash=v
d
.hash_string("/eishoSu2"));
set req.backend_hint = vd.backend(hash=v
slp
.hash_string("/eishoSu2"));
return(pass);
return(pass);
}
}
...
...
src/vmod_vslp.c
View file @
d4dc46ed
...
@@ -76,6 +76,20 @@ vmod_vslp__fini(struct vmod_vslp_vslp **vslpdp)
...
@@ -76,6 +76,20 @@ vmod_vslp__fini(struct vmod_vslp_vslp **vslpdp)
FREE_OBJ
(
vslpd
);
FREE_OBJ
(
vslpd
);
}
}
VCL_INT
__match_proto__
(
td_vslp_hash_string
)
vmod_hash_string
(
const
struct
vrt_ctx
*
ctx
,
VCL_STRING
s
,
VCL_ENUM
hash_m
)
{
uint32_t
hash
;
hash_func
hash_fp
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
hash_fp
=
vslp_get_hash_fp
(
hash_m
);
hash
=
hash_fp
(
s
?
s
:
""
);
return
(
hash
);
}
VCL_VOID
__match_proto__
(
td_vslp_vslp_add_backend
)
VCL_VOID
__match_proto__
(
td_vslp_vslp_add_backend
)
vmod_vslp_add_backend
(
const
struct
vrt_ctx
*
ctx
,
struct
vmod_vslp_vslp
*
vslpd
,
VCL_BACKEND
be
)
vmod_vslp_add_backend
(
const
struct
vrt_ctx
*
ctx
,
struct
vmod_vslp_vslp
*
vslpd
,
VCL_BACKEND
be
)
{
{
...
@@ -121,21 +135,6 @@ vmod_vslp_init_hashcircle(const struct vrt_ctx *ctx, struct vmod_vslp_vslp *vslp
...
@@ -121,21 +135,6 @@ vmod_vslp_init_hashcircle(const struct vrt_ctx *ctx, struct vmod_vslp_vslp *vslp
vslpdir_init_hashcircle
(
vslpd
->
vslpd
,
replicas
);
vslpdir_init_hashcircle
(
vslpd
->
vslpd
,
replicas
);
}
}
VCL_INT
__match_proto__
(
td_vslp_vslp_hash_string
)
vmod_vslp_hash_string
(
const
struct
vrt_ctx
*
ctx
,
struct
vmod_vslp_vslp
*
vslpd
,
VCL_STRING
s
,
VCL_ENUM
hash_m
)
{
uint32_t
hash
;
hash_func
hash_fp
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
vslpd
,
VMOD_VSLP_VSLP_MAGIC
);
hash_fp
=
vslp_get_hash_fp
(
hash_m
);
hash
=
hash_fp
(
s
?
s
:
""
);
return
(
hash
);
}
VCL_BACKEND
__match_proto__
(
td_vslp_vslp_backend
)
VCL_BACKEND
__match_proto__
(
td_vslp_vslp_backend
)
vmod_vslp_backend
(
const
struct
vrt_ctx
*
ctx
,
struct
vmod_vslp_vslp
*
vslpd
,
VCL_INT
n
,
VCL_BOOL
altsrv_p
,
VCL_BOOL
healthy
,
VCL_INT
i
)
vmod_vslp_backend
(
const
struct
vrt_ctx
*
ctx
,
struct
vmod_vslp_vslp
*
vslpd
,
VCL_INT
n
,
VCL_BOOL
altsrv_p
,
VCL_BOOL
healthy
,
VCL_INT
i
)
{
{
...
...
src/vmod_vslp.vcc
View file @
d4dc46ed
...
@@ -28,11 +28,12 @@
...
@@ -28,11 +28,12 @@
$Module vslp 3 Varnish StateLess Persistency Director aka Shard Director
$Module vslp 3 Varnish StateLess Persistency Director aka Shard Director
$Function INT hash_string(STRING string, ENUM { CRC32, SHA256, RS } alg="CRC32")
$Object vslp()
$Object vslp()
$Method VOID .add_backend(BACKEND)
$Method VOID .add_backend(BACKEND)
$Method VOID .set_rampup_ratio(REAL)
$Method VOID .set_rampup_ratio(REAL)
$Method VOID .set_rampup_time(DURATION)
$Method VOID .set_rampup_time(DURATION)
$Method VOID .set_hash(ENUM { CRC32, SHA256, RS })
$Method VOID .set_hash(ENUM { CRC32, SHA256, RS })
$Method VOID .init_hashcircle(INT)
$Method VOID .init_hashcircle(INT)
$Method INT .hash_string(STRING string, ENUM { CRC32, SHA256, RS } alg="CRC32")
$Method BACKEND .backend(INT nte=0, BOOL altsrv_p=1, BOOL healthy=1, INT hash=0)
$Method BACKEND .backend(INT nte=0, BOOL altsrv_p=1, BOOL healthy=1, INT hash=0)
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