Drop the n_wrk_busy statistics, it is too expensive to maintain

due to locking.

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

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index c529cb4acf9639ee04d1e06b46f321fea912ae82..058161df7c20482fe15708f1e51f89ffec5651ef 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -188,7 +188,6 @@ wrk_thread(void *priv)
 
        VSL(SLT_WorkThread, 0, "%p start", w);
        LOCK(&tmtx);
-       VSL_stats->n_wrk_busy++;
        VSL_stats->n_wrk_create++;
        UNLOCK(&tmtx);
        while (1) {
@@ -213,9 +212,6 @@ wrk_thread(void *priv)
                TAILQ_INSERT_HEAD(&qp->idle, w, list);
                assert(w->idle != 0);
                UNLOCK(&qp->mtx);
-               LOCK(&tmtx);
-               VSL_stats->n_wrk_busy--;
-               UNLOCK(&tmtx);
                assert(1 == read(w->pipe[0], &c, 1));
                if (w->idle == 0)
                        break;
@@ -266,9 +262,6 @@ WRK_QueueSession(struct sess *sp)
                UNLOCK(&qp->mtx);
                w->wrq = &sp->workreq;
                assert(1 == write(w->pipe[1], w, 1));
-               LOCK(&tmtx);
-               VSL_stats->n_wrk_busy++;
-               UNLOCK(&tmtx);
                return;
        }
        

diff --git a/varnish-cache/include/stat_field.h b/varnish-cache/include/stat_field.h
index 16d34b865ce3b15d7f83b03a71566bc31d5645b1..3bcc8a023c9d0235e324c79de9939f70c2418c06 100644 (file)
--- a/varnish-cache/include/stat_field.h
+++ b/varnish-cache/include/stat_field.h
@@ -25,7 +25,6 @@ MAC_STAT(n_wrk,                       uint64_t, "u", "N worker threads")
 MAC_STAT(n_wrk_create,         uint64_t, "u", "N worker threads created")
 MAC_STAT(n_wrk_failed,         uint64_t, "u", "N worker threads not created")
 MAC_STAT(n_wrk_max,            uint64_t, "u", "N worker threads limited")
-MAC_STAT(n_wrk_busy,           uint64_t, "u", "N busy worker threads")
 MAC_STAT(n_wrk_queue,          uint64_t, "u", "N queued work requests")
 MAC_STAT(n_wrk_overflow,       uint64_t, "u", "N overflowed work requests")