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
c180d472
Commit
c180d472
authored
Jan 09, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start sharing vsmw_clusters for static backends in same VCL.
parent
111a42f7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
cache_vrt.c
bin/varnishd/cache/cache_vrt.c
+12
-2
common_vsmw.c
bin/varnishd/common/common_vsmw.c
+6
-2
No files found.
bin/varnishd/cache/cache_vrt.c
View file @
c180d472
...
...
@@ -42,6 +42,9 @@
#include "vtcp.h"
#include "vtim.h"
#include "common/heritage.h"
#include "common/vsmw.h"
const
void
*
const
vrt_magic_string_end
=
&
vrt_magic_string_end
;
const
void
*
const
vrt_magic_string_unset
=
&
vrt_magic_string_unset
;
...
...
@@ -628,10 +631,17 @@ VRT_purge(VRT_CTX, double ttl, double grace, double keep)
struct
vsmw_cluster
*
v_matchproto_
()
VRT_VSM_Cluster_New
(
VRT_CTX
,
size_t
sz
)
{
struct
vsmw_cluster
*
vc
;
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
AN
(
sz
);
return
((
void
*
)
VRT_VSM_Cluster_New
);
assert
(
sz
>
0
);
AN
(
vsc_lock
);
AN
(
vsc_unlock
);
AN
(
heritage
.
proc_vsmw
);
vsc_lock
();
vc
=
VSMW_NewCluster
(
heritage
.
proc_vsmw
,
sz
,
"VSC_cluster"
);
vsc_unlock
();
return
(
vc
);
}
void
v_matchproto_
()
...
...
bin/varnishd/common/common_vsmw.c
View file @
c180d472
...
...
@@ -75,6 +75,7 @@ struct vsmw_cluster {
char
*
fn
;
size_t
len
;
void
*
ptr
;
size_t
next
;
int
refs
;
};
...
...
@@ -239,12 +240,15 @@ VSMW_Allocv(struct vsmw *vsmw, struct vsmw_cluster *vc,
AZ
(
VSB_finish
(
vsmw
->
vsb
));
REPLACE
(
seg
->
id
,
VSB_data
(
vsmw
->
vsb
));
vc
=
VSMW_NewCluster
(
vsmw
,
64
+
len
,
class
);
if
(
vc
==
NULL
)
vc
=
VSMW_NewCluster
(
vsmw
,
len
,
class
);
AN
(
vc
);
vc
->
refs
++
;
seg
->
cluster
=
vc
;
seg
->
off
=
64
;
seg
->
off
=
vc
->
next
;
vc
->
next
+=
len
;
assert
(
vc
->
next
<=
vc
->
len
);
seg
->
ptr
=
seg
->
off
+
(
char
*
)
vc
->
ptr
;
VTAILQ_INSERT_TAIL
(
&
vsmw
->
segs
,
seg
,
list
);
...
...
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