Keep an eye on deathrow

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@529 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_expire.c

@@ -76,8 +76,10 @@ exp_hangman(void *arg)
 			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 @@ exp_prefetch(void *arg)
 		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;
 		}

include/stat_field.h

@@ -26,4 +26,7 @@ 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_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")