Move shmlog entry, remove debugging

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@147 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index 29d227a5c1ce9d786bb8819fe9ea41ebcd35d02f..148b093d30f831daf26f831c547255f6441cebfa 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -37,6 +37,7 @@ FetchSession(struct worker *w, struct sess *sp)
 
        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 @@ FetchSession(struct worker *w, struct sess *sp)
        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 @@ FetchSession(struct worker *w, struct sess *sp)
 
        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 @@ FetchSession(struct worker *w, struct sess *sp)
 
        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;

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 16c0c354d4dcc36e671898426cbfc6c857e37800..fcae16895722db8bee7e743f93583049587ca530 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -134,7 +134,6 @@ CacheWorker(void *priv)
                                done = LookupSession(&w, sp);
                                break;
                        case HND_Fetch:
-                               VSL(SLT_Handling, sp->fd, "Fetch");
                                done = FetchSession(&w, sp);
                                break;
                        case HND_Deliver: