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
111a42f7
Commit
111a42f7
authored
Jan 09, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass the vsmw_cluster arg through
parent
88e5a96e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
cache_backend.c
bin/varnishd/cache/cache_backend.c
+1
-2
common_vsc.c
bin/varnishd/common/common_vsc.c
+5
-5
No files found.
bin/varnishd/cache/cache_backend.c
View file @
111a42f7
...
...
@@ -433,7 +433,6 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
int
retval
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
(
void
)
vc
;
CHECK_OBJ_NOTNULL
(
vrt
,
VRT_BACKEND_MAGIC
);
assert
(
vrt
->
ipv4_suckaddr
!=
NULL
||
vrt
->
ipv6_suckaddr
!=
NULL
);
...
...
@@ -486,7 +485,7 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
VBP_Insert
(
be
,
vbp
,
be
->
tcp_pool
);
}
be
->
vsc
=
VSC_vbe_New
(
NULL
,
&
be
->
vsc_seg
,
be
->
vsc
=
VSC_vbe_New
(
vc
,
&
be
->
vsc_seg
,
"%s.%s"
,
VCL_Name
(
ctx
->
vcl
),
vrt
->
vcl_name
);
AN
(
be
->
vsc
);
...
...
bin/varnishd/common/common_vsc.c
View file @
111a42f7
...
...
@@ -75,7 +75,8 @@ vsc_callback_f *vsc_lock;
vsc_callback_f
*
vsc_unlock
;
static
struct
vsc_seg
*
vrt_vsc_mksegv
(
const
char
*
class
,
size_t
payload
,
const
char
*
fmt
,
va_list
va
)
vrt_vsc_mksegv
(
struct
vsmw_cluster
*
vc
,
const
char
*
class
,
size_t
payload
,
const
char
*
fmt
,
va_list
va
)
{
struct
vsc_seg
*
vsg
;
size_t
co
;
...
...
@@ -83,7 +84,7 @@ vrt_vsc_mksegv(const char *class, size_t payload, const char *fmt, va_list va)
co
=
PRNDUP
(
sizeof
(
struct
vsc_head
));
ALLOC_OBJ
(
vsg
,
VSC_SEG_MAGIC
);
AN
(
vsg
);
vsg
->
seg
=
VSMW_Allocv
(
heritage
.
proc_vsmw
,
NULL
,
class
,
vsg
->
seg
=
VSMW_Allocv
(
heritage
.
proc_vsmw
,
vc
,
class
,
co
+
PRNDUP
(
payload
),
fmt
,
va
);
AN
(
vsg
->
seg
);
vsg
->
vsm
=
heritage
.
proc_vsmw
;
...
...
@@ -100,7 +101,7 @@ vrt_vsc_mksegf(const char *class, size_t payload, const char *fmt, ...)
struct
vsc_seg
*
vsg
;
va_start
(
ap
,
fmt
);
vsg
=
vrt_vsc_mksegv
(
class
,
payload
,
fmt
,
ap
);
vsg
=
vrt_vsc_mksegv
(
NULL
,
class
,
payload
,
fmt
,
ap
);
va_end
(
ap
);
return
(
vsg
);
}
...
...
@@ -130,7 +131,6 @@ VRT_VSC_Alloc(struct vsmw_cluster *vc, struct vsc_seg **sg,
char
buf
[
1024
];
uintptr_t
jjp
;
AZ
(
vc
);
if
(
vsc_lock
!=
NULL
)
vsc_lock
();
...
...
@@ -164,7 +164,7 @@ VRT_VSC_Alloc(struct vsmw_cluster *vc, struct vsc_seg **sg,
AN
(
heritage
.
proc_vsmw
);
vsg
=
vrt_vsc_mksegv
(
VSC_CLASS
,
sd
,
buf
,
va
);
vsg
=
vrt_vsc_mksegv
(
vc
,
VSC_CLASS
,
sd
,
buf
,
va
);
AN
(
vsg
);
vsg
->
nm
=
nm
;
vsg
->
doc
=
dvsg
;
...
...
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