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
b5879569
Commit
b5879569
authored
Sep 23, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Struct dstat is called VSC_main now
parent
47649ea0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
13 deletions
+10
-13
cache.h
bin/varnishd/cache/cache.h
+2
-5
cache_pool.c
bin/varnishd/cache/cache_pool.c
+2
-2
cache_pool.h
bin/varnishd/cache/cache_pool.h
+2
-2
cache_req.c
bin/varnishd/cache/cache_req.c
+1
-1
cache_wrk.c
bin/varnishd/cache/cache_wrk.c
+3
-3
No files found.
bin/varnishd/cache/cache.h
View file @
b5879569
...
...
@@ -116,11 +116,8 @@ struct vrt_priv;
struct
vsb
;
struct
worker
;
struct
v1l
;
struct
VSC_main
;
#define dstat VSC_main
#define DIGEST_LEN 32
/*--------------------------------------------------------------------*/
...
...
@@ -309,7 +306,7 @@ struct worker {
struct
objhead
*
nobjhead
;
struct
objcore
*
nobjcore
;
void
*
nhashpriv
;
struct
dstat
*
stats
;
struct
VSC_main
*
stats
;
struct
vsl_log
*
vsl
;
// borrowed from req/bo
struct
pool_task
task
;
...
...
@@ -898,7 +895,7 @@ struct req *Req_New(const struct worker *, struct sess *);
void
Req_Release
(
struct
req
*
);
void
Req_Cleanup
(
struct
sess
*
sp
,
struct
worker
*
wrk
,
struct
req
*
req
);
void
Req_Fail
(
struct
req
*
req
,
enum
sess_close
reason
);
void
Req_AcctLogCharge
(
struct
dstat
*
,
struct
req
*
);
void
Req_AcctLogCharge
(
struct
VSC_main
*
,
struct
req
*
);
/* cache_req_body.c */
int
VRB_Ignore
(
struct
req
*
);
...
...
bin/varnishd/cache/cache_pool.c
View file @
b5879569
...
...
@@ -51,7 +51,7 @@ static VTAILQ_HEAD(,pool) pools = VTAILQ_HEAD_INITIALIZER(pools);
*/
static
void
pool_sumstat
(
const
struct
dstat
*
src
)
pool_sumstat
(
const
struct
VSC_main
*
src
)
{
Lck_AssertHeld
(
&
wstat_mtx
);
...
...
@@ -121,7 +121,7 @@ Pool_PurgeStat(unsigned nobj)
void
__match_proto__
(
task_func_t
)
pool_stat_summ
(
struct
worker
*
wrk
,
void
*
priv
)
{
struct
dstat
*
src
;
struct
VSC_main
*
src
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
wrk
->
pool
,
POOL_MAGIC
);
...
...
bin/varnishd/cache/cache_pool.h
View file @
b5879569
...
...
@@ -53,8 +53,8 @@ struct pool {
uintmax_t
sdropped
;
uintmax_t
rdropped
;
uintmax_t
nqueued
;
struct
dstat
*
a_stat
;
struct
dstat
*
b_stat
;
struct
VSC_main
*
a_stat
;
struct
VSC_main
*
b_stat
;
struct
mempool
*
mpl_req
;
struct
mempool
*
mpl_sess
;
...
...
bin/varnishd/cache/cache_req.c
View file @
b5879569
...
...
@@ -43,7 +43,7 @@
#include "vtim.h"
void
Req_AcctLogCharge
(
struct
dstat
*
ds
,
struct
req
*
req
)
Req_AcctLogCharge
(
struct
VSC_main
*
ds
,
struct
req
*
req
)
{
struct
acct_req
*
a
;
...
...
bin/varnishd/cache/cache_wrk.c
View file @
b5879569
...
...
@@ -61,7 +61,7 @@ wrk_bgthread(void *arg)
{
struct
bgthread
*
bt
;
struct
worker
wrk
;
struct
dstat
ds
;
struct
VSC_main
ds
;
CAST_OBJ_NOTNULL
(
bt
,
arg
,
BGTHREAD_MAGIC
);
THR_SetName
(
bt
->
name
);
...
...
@@ -97,7 +97,7 @@ static void
WRK_Thread
(
struct
pool
*
qp
,
size_t
stacksize
,
unsigned
thread_workspace
)
{
struct
worker
*
w
,
ww
;
struct
dstat
ds
;
struct
VSC_main
ds
;
unsigned
char
ws
[
thread_workspace
];
uintptr_t
u
;
...
...
@@ -141,7 +141,7 @@ WRK_Thread(struct pool *qp, size_t stacksize, unsigned thread_workspace)
*/
static
void
pool_addstat
(
struct
dstat
*
dst
,
struct
dstat
*
src
)
pool_addstat
(
struct
VSC_main
*
dst
,
struct
VSC_main
*
src
)
{
dst
->
summs
++
;
...
...
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