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

phk at projects.linpro.no phk at projects.linpro.no
Thu Jul 20 16:46:49 CEST 2006


Author: phk
Date: 2006-07-20 16:46:49 +0200 (Thu, 20 Jul 2006)
New Revision: 529

Modified:
   trunk/varnish-cache/bin/varnishd/cache_expire.c
   trunk/varnish-cache/include/stat_field.h
Log:
Keep an eye on deathrow


Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2006-07-20 14:40:54 UTC (rev 528)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2006-07-20 14:46:49 UTC (rev 529)
@@ -76,8 +76,10 @@
 			continue;
 		}
 		TAILQ_REMOVE(&exp_deathrow, o, deathrow);
+		VSL_stats->n_deathrow--;
+		VSL_stats->n_expired++;
 		AZ(pthread_mutex_unlock(&exp_mtx));
-		VSL(SLT_ExpKill, 0, "%u", o->xid);
+		VSL(SLT_ExpKill, 0, "%u %d", o->xid, (int)(o->ttl - t));
 		HSH_Deref(o);
 	}
 }
@@ -124,6 +126,7 @@
 		if (sp->handling == VCL_RET_DISCARD) {
 			AZ(pthread_mutex_lock(&exp_mtx));
 			TAILQ_INSERT_TAIL(&exp_deathrow, o, deathrow);
+			VSL_stats->n_deathrow++;
 			AZ(pthread_mutex_unlock(&exp_mtx));
 			continue;
 		}

Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h	2006-07-20 14:40:54 UTC (rev 528)
+++ trunk/varnish-cache/include/stat_field.h	2006-07-20 14:46:49 UTC (rev 529)
@@ -26,4 +26,7 @@
 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_expired,		uint64_t, "u", "N expired objects")
+MAC_STAT(n_deathrow,		uint64_t, "u", "N objects on deathrow")
+
 MAC_STAT(losthdr,		uint64_t, "u", "HTTP header overflows")




More information about the varnish-commit mailing list