r147 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-04-25 08:48:56 +0200 (Tue, 25 Apr 2006)
New Revision: 147

Modified:
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
   trunk/varnish-cache/bin/varnishd/cache_pool.c
Log:
Move shmlog entry, remove debugging


Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2006-04-25 06:16:22 UTC (rev 146)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2006-04-25 06:48:56 UTC (rev 147)
@@ -37,6 +37,7 @@
 
 	fd = VBE_GetFd(sp->backend, &fd_token);
 	assert(fd != -1);
+	VSL(SLT_Handling, sp->fd, "Fetch fd %d", fd);
 
 	hp = http_New();
 	http_BuildSbuf(0, w->sb, sp->http);
@@ -66,7 +67,6 @@
 	assert(http_GetHdr(hp, "Content-Length", &b));
 
 	cl = strtoumax(b, NULL, 0);
-	VSL(SLT_Debug, 0, "cl %jd (%s)",  cl, b);
 
 	sp->handling = HND_Unclass;
 	sp->vcl->fetch_func(sp);
@@ -83,7 +83,6 @@
 
 	if (http_GetTail(hp, cl, &b, &e)) {
 		i = e - b;
-		VSL(SLT_Debug, 0, "T i %d cl %jd", i, cl);
 		memcpy(p, b, i);
 		p += i;
 		cl -= i;
@@ -91,7 +90,6 @@
 
 	while (cl != 0) {
 		i = read(sp2.fd, p, cl);
-		VSL(SLT_Debug, 0, "R i %d cl %jd", i, cl);
 		assert(i > 0);
 		p += i;
 		cl -= i;

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-04-25 06:16:22 UTC (rev 146)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-04-25 06:48:56 UTC (rev 147)
@@ -134,7 +134,6 @@
 				done = LookupSession(&w, sp);
 				break;
 			case HND_Fetch:
-				VSL(SLT_Handling, sp->fd, "Fetch");
 				done = FetchSession(&w, sp);
 				break;
 			case HND_Deliver: