[experimental-ims] 40575c5 Reintroduce ExpKill VSL records.

Geoff Simmons geoff at varnish-cache.org
Wed Aug 31 16:04:47 CEST 2011


commit 40575c5d132c654d10aa0a28cf0530dd0b7b178a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 30 07:37:06 2011 +0000

    Reintroduce ExpKill VSL records.
    
    Fixes		#946
    
    Patch by	scoof

diff --git a/bin/varnishd/cache_expire.c b/bin/varnishd/cache_expire.c
index b32d22b..a07ab6d 100644
--- a/bin/varnishd/cache_expire.c
+++ b/bin/varnishd/cache_expire.c
@@ -338,6 +338,7 @@ exp_timer(struct sess *sp, void *priv)
 	struct objcore *oc;
 	struct lru *lru;
 	double t;
+	struct object *o;
 
 	(void)priv;
 	t = TIM_real();
@@ -401,6 +402,9 @@ exp_timer(struct sess *sp, void *priv)
 		VSC_C_main->n_expired++;
 
 		CHECK_OBJ_NOTNULL(oc->objhead, OBJHEAD_MAGIC);
+		o = oc_getobj(sp->wrk, oc);
+		WSL(sp->wrk, SLT_ExpKill, 0, "%u %.0f",
+		    o->xid, EXP_Ttl(NULL, o) - t);
 		(void)HSH_Deref(sp->wrk, oc, NULL);
 	}
 	NEEDLESS_RETURN(NULL);



More information about the varnish-commit mailing list