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

[phk at projects.linpro.no]

Author: phk
Date: 2008-07-31 11:25:25 +0200 (Thu, 31 Jul 2008)
New Revision: 3037

Modified:
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/include/stat_field.h
Log:
Make separate stats counters for number of object checked against purges
and number of regexps checked.



Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2008-07-31 09:24:25 UTC (rev 3036)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2008-07-31 09:25:25 UTC (rev 3037)
@@ -176,7 +176,8 @@
 	o->ban->refcount--;
 	if (b == o->ban)	/* not banned */
 		b0->refcount++;
-	VSL_stats->n_purge_test++;
+	VSL_stats->n_purge_obj_test++;
+	VSL_stats->n_purge_re_test += tests;
 	UNLOCK(&ban_mtx);
 
 	if (b == o->ban) {	/* not banned */

Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h	2008-07-31 09:24:25 UTC (rev 3036)
+++ trunk/varnish-cache/include/stat_field.h	2008-07-31 09:25:25 UTC (rev 3037)
@@ -120,4 +120,5 @@
 MAC_STAT(n_purge,		uint64_t, 'i', "N total active purges")
 MAC_STAT(n_purge_add,		uint64_t, 'a', "N new purges added")
 MAC_STAT(n_purge_retire,	uint64_t, 'a', "N old purges deleted")
-MAC_STAT(n_purge_test,		uint64_t, 'a', "N purge record tests")
+MAC_STAT(n_purge_obj_test,	uint64_t, 'a', "N objects tested")
+MAC_STAT(n_purge_re_test,	uint64_t, 'a', "N regexps tested against")