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

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-07 19:27:16 +0200 (Mon, 07 Aug 2006)
New Revision: 747

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/include/shmlog_tags.h
Log:
Rename SHMlog tags for consistency
	XID -> ReqStart
	ReqServTime -> ReqEnd


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-08-07 17:18:58 UTC (rev 746)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-08-07 17:27:16 UTC (rev 747)
@@ -88,7 +88,7 @@
 	sp->step = STP_RECV;
 	VSL_stats->client_req++;
 	sp->xid = xids++;
-	VSL(SLT_XID, sp->fd, "%u", sp->xid);
+	VSL(SLT_ReqStart, sp->fd, "XID %u", sp->xid);
 	WRK_QueueSession(sp);
 }
 

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2006-08-07 17:18:58 UTC (rev 746)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2006-08-07 17:27:16 UTC (rev 747)
@@ -106,7 +106,7 @@
 	dh = cnt_dt(&sp->t_open, &sp->t_req);
 	dp = cnt_dt(&sp->t_req, &sp->t_resp);
 	da = cnt_dt(&sp->t_resp, &te);
-	VSL(SLT_ReqServTime, sp->id, "%u %ld.%09ld %.9f %.9f %.9f",
+	VSL(SLT_ReqEnd, sp->id, "%u %ld.%09ld %.9f %.9f %.9f",
 	    sp->xid, (long)sp->t_req.tv_sec, (long)sp->t_req.tv_nsec,
 	    dh, dp, da);
 

Modified: trunk/varnish-cache/include/shmlog_tags.h
===================================================================
--- trunk/varnish-cache/include/shmlog_tags.h	2006-08-07 17:18:58 UTC (rev 746)
+++ trunk/varnish-cache/include/shmlog_tags.h	2006-08-07 17:27:16 UTC (rev 747)
@@ -13,7 +13,7 @@
 SLTM(CLI)
 SLTM(StatAddr)
 SLTM(StatSess)
-SLTM(ReqServTime)
+SLTM(ReqEnd)
 SLTM(SessionOpen)
 SLTM(SessionReuse)
 SLTM(SessionClose)
@@ -56,7 +56,7 @@
 SLTM(VCL_call)
 SLTM(VCL_trace)
 SLTM(VCL_return)
-SLTM(XID)
+SLTM(ReqStart)
 SLTM(Hit)
 SLTM(HitPass)
 SLTM(ExpBan)