[master] b587956 Struct dstat is called VSC_main now
Poul-Henning Kamp
phk at FreeBSD.org
Sat Sep 23 22:37:06 UTC 2017
commit b58795692449800d0f0d89681f393358cd688c70
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Sep 23 22:27:58 2017 +0000
Struct dstat is called VSC_main now
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index cd3b2a0..303e038 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -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 *);
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 595e836..e25b3a0 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -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);
diff --git a/bin/varnishd/cache/cache_pool.h b/bin/varnishd/cache/cache_pool.h
index 4814c50..c954aee 100644
--- a/bin/varnishd/cache/cache_pool.h
+++ b/bin/varnishd/cache/cache_pool.h
@@ -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;
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 601574a..2d06616 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -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;
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 8735929..b7729b1 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -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++;
More information about the varnish-commit
mailing list