Tag objects with their origin session xid and log it when we clean up.

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

bin/varnishd/cache.h

@@ -65,6 +65,7 @@ extern struct stevedore *stevedore;
 
 struct object {	
 	unsigned 		refcnt;
+	unsigned		xid;
 	struct objhead		*objhead;
 	pthread_cond_t		cv;
 

bin/varnishd/cache_expire.c

@@ -52,6 +52,7 @@ exp_hangman(void *arg)
 		}
 		TAILQ_REMOVE(&exp_deathrow, o, deathrow);
 		AZ(pthread_mutex_unlock(&exp_mtx));
+		VSL(SLT_ExpKill, 0, "%u", o->xid);
 		HSH_Deref(o);
 	}
 }
@@ -83,6 +84,7 @@ exp_prefetch(void *arg)
 		}
 		binheap_delete(exp_heap, 0);
 		AZ(pthread_mutex_unlock(&exp_mtx));
+		VSL(SLT_ExpPick, 0, "%u", o->xid);
 
 		sp.vcl = GetVCL();
 		sp.obj = o;

bin/varnishd/cache_fetch.c

@@ -245,6 +245,8 @@ FetchSession(struct worker *w, struct sess *sp)
 	time_t t_req, t_resp;
 	int body;
 
+	sp->obj->xid = sp->xid;
+
 	fd = VBE_GetFd(sp->backend, &fd_token, sp->xid);
 	assert(fd != -1);
 	VSL(SLT_Backend, sp->fd, "%d %s", fd, sp->backend->vcl_name);

include/shmlog_tags.h

@@ -34,3 +34,5 @@ SLTM(BldHdr)
 SLTM(LostHeader)
 SLTM(VCL)
 SLTM(XID)
+SLTM(ExpPick)
+SLTM(ExpKill)