r1073 - in trunk/varnish-cache: bin/varnishd include

[phk at projects.linpro.no]

Author: phk
Date: 2006-09-18 12:41:20 +0200 (Mon, 18 Sep 2006)
New Revision: 1073

Modified:
   trunk/varnish-cache/bin/varnishd/cache_pool.c
   trunk/varnish-cache/include/stat_field.h
Log:
Drop the n_wrk_busy statistics, it is too expensive to maintain
due to locking.


Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-09-18 10:38:13 UTC (rev 1072)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-09-18 10:41:20 UTC (rev 1073)
@@ -188,7 +188,6 @@
 
 	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 @@
 		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 @@
 		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;
 	}
 	

Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h	2006-09-18 10:38:13 UTC (rev 1072)
+++ trunk/varnish-cache/include/stat_field.h	2006-09-18 10:41:20 UTC (rev 1073)
@@ -25,7 +25,6 @@
 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")