Keep track of how often we flush the private shm buffer due to overflows.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2557 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 400e8fa56b8dc8f40fda9c0e53e9febbb40b6a77..b4352a1a65a988bc994c8ead736d947d5bfde150 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -520,7 +520,7 @@ void VSLR(enum shmlogtag tag, int id, txt t);
 void VSL(enum shmlogtag tag, int id, const char *fmt, ...);
 void WSLR(struct worker *w, enum shmlogtag tag, int id, txt t);
 void WSL(struct worker *w, enum shmlogtag tag, int id, const char *fmt, ...);
-void WSL_Flush(struct worker *w);
+void WSL_Flush(struct worker *w, int overflow);
 #define WSP(sess, tag, fmt, ...) \
        WSL((sess)->wrk, tag, (sess)->fd, fmt, __VA_ARGS__)
 #define WSPR(sess, tag, txt) \

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index bb686de2ab125adb5a04eb9abb5ca70f9959ace7..91a202e08b4a4d68e51e4a4b834231b894417e4a 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -228,7 +228,7 @@ cnt_done(struct sess *sp)
        sp->t_open = sp->t_end;
        sp->t_req = NAN;
        sp->t_resp = NAN;
-       WSL_Flush(sp->wrk);
+       WSL_Flush(sp->wrk, 0);
 
        /* If we did an ESI include, don't mess up our state */
        if (sp->esis > 0)
@@ -879,7 +879,7 @@ cnt_diag(struct sess *sp, const char *state)
                WSL(sp->wrk, SLT_Debug, sp->id,
                    "thr %p STP_%s sp %p obj %p vcl %p",
                    pthread_self(), state, sp, sp->obj, sp->vcl);
-               WSL_Flush(sp->wrk);
+               WSL_Flush(sp->wrk, 0);
        } else {
                VSL(SLT_Debug, sp->id,
                    "thr %p STP_%s sp %p obj %p vcl %p",
@@ -925,7 +925,7 @@ CNT_Session(struct sess *sp)
                CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
        }
        assert(!isnan(w->used));
-       WSL_Flush(w);
+       WSL_Flush(w, 0);
 }
 
 /*

diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index c9ddddcfd71d2c58ab3d127d251fde7503fc44e0..49b9abe77b7248671b58631669eab1b80d059855 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -280,7 +280,7 @@ exp_timer(void *arg)
                CHECK_OBJ_ORNULL(oe, OBJEXP_MAGIC);
                if (oe == NULL || oe->timer_when > t) { /* XXX: > or >= ? */
                        UNLOCK(&exp_mtx);
-                       WSL_Flush(&ww);
+                       WSL_Flush(&ww, 0);
                        AZ(sleep(1));
                        VCL_Refresh(&sp->vcl);
                        t = TIM_real();

diff --git a/varnish-cache/bin/varnishd/cache_synthetic.c b/varnish-cache/bin/varnishd/cache_synthetic.c
index a3cf38d9248e8005168c3686223b6a2bb13c94c1..093e855005ab85c7c2453289edfb5dc38fcc8fb1 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_synthetic.c
+++ b/varnish-cache/bin/varnishd/cache_synthetic.c
@@ -59,7 +59,7 @@ SYN_ErrorPage(struct sess *sp, int status, const char *reason)
        int fd;
        int ttl = 0;                            /* XXX: ?? */
 
-       WSL_Flush(sp->wrk);
+       WSL_Flush(sp->wrk, 0);
        assert(status >= 100 && status <= 999);
        CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
        CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);

diff --git a/varnish-cache/bin/varnishd/shmlog.c b/varnish-cache/bin/varnishd/shmlog.c
index 218b3f81742e30ad1e47730dca093c8de2bcfd7d..2abbe32640091d5a4c9d64fa25ccf96587230a86 100644 (file)
--- a/varnish-cache/bin/varnishd/shmlog.c
+++ b/varnish-cache/bin/varnishd/shmlog.c
@@ -170,7 +170,7 @@ VSL(enum shmlogtag tag, int id, const char *fmt, ...)
 /*--------------------------------------------------------------------*/
 
 void
-WSL_Flush(struct worker *w)
+WSL_Flush(struct worker *w, int overflow)
 {
        unsigned char *p;
        unsigned l;
@@ -179,6 +179,7 @@ WSL_Flush(struct worker *w)
        if (l == 0)
                return;
        LOCKSHM(&vsl_mtx);
+       VSL_stats->shm_flushes += overflow;
        VSL_stats->shm_writes++;
        VSL_stats->shm_records += w->wlr;
        if (loghead->ptr + l + 1 >= loghead->size)
@@ -216,7 +217,7 @@ WSLR(struct worker *w, enum shmlogtag tag, int id, txt t)
 
        /* Wrap if necessary */
        if (w->wlp + SHMLOG_NEXTTAG + l + 1 >= w->wle)
-               WSL_Flush(w);
+               WSL_Flush(w, 1);
        p = w->wlp;
        w->wlp += SHMLOG_NEXTTAG + l;
        assert(w->wlp < w->wle);
@@ -247,7 +248,7 @@ WSL(struct worker *w, enum shmlogtag tag, int id, const char *fmt, ...)
 
                /* Wrap if we cannot fit a full size record */
                if (w->wlp + SHMLOG_NEXTTAG + 255 + 1 >= w->wle)
-                       WSL_Flush(w);
+                       WSL_Flush(w, 1);
 
                p = w->wlp;
                n = vsnprintf((char *)(p + SHMLOG_DATA), 256, fmt, ap);

diff --git a/varnish-cache/include/stat_field.h b/varnish-cache/include/stat_field.h
index 90baaa125e69a5669cb6b39c41369e72722da6aa..c3910eba2437a7b0366e65de3e5d157555777d8f 100644 (file)
--- a/varnish-cache/include/stat_field.h
+++ b/varnish-cache/include/stat_field.h
@@ -88,6 +88,7 @@ MAC_STAT(sess_herd,           uint64_t, 'a', "Session herd")
 
 MAC_STAT(shm_records,          uint64_t, 'a', "SHM records")
 MAC_STAT(shm_writes,           uint64_t, 'a', "SHM writes")
+MAC_STAT(shm_flushes,          uint64_t, 'a', "SHM flushes due to overflow")
 MAC_STAT(shm_cont,             uint64_t, 'a', "SHM MTX contention")
 
 MAC_STAT(sm_nreq,              uint64_t, 'a', "allocator requests")