debug section cleanup

diff --git a/src/asn.cc b/src/asn.cc
index 5cca53d10bc398010d961022f31ebd6c0da971ba..0362f68321941e9770b11d8fbcea84fbc5fae345 100644 (file)
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: asn.cc,v 1.19 1998/02/06 00:49:00 wessels Exp $
+ * $Id: asn.cc,v 1.20 1998/02/10 22:17:52 wessels Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -206,7 +206,7 @@ asHandleReply(void *data, char *buf, ssize_t size)
     StoreEntry *e = asState->entry;
     char *s;
     char *t;
-    debug(50, 3) ("asHandleReply: Called with size=%d.\n", size);
+    debug(53, 3) ("asHandleReply: Called with size=%d.\n", size);
     if (e->store_status == STORE_ABORTED) {
        memFree(MEM_4K_BUF, buf);
        return;
@@ -215,7 +215,7 @@ asHandleReply(void *data, char *buf, ssize_t size)
        memFree(MEM_4K_BUF, buf);
        return;
     } else if (size < 0) {
-       debug(50, 1) ("asHandleReply: Called with size=%d.\n", size);
+       debug(53, 1) ("asHandleReply: Called with size=%d.\n", size);
        memFree(MEM_4K_BUF, buf);
        return;
     }

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index a97cd1cb290f5b6c914a6b3a660218fe0cfbff4a..693cad0e4c9a3b4b29bc4c0bc9d2e18bd349562f 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -1,7 +1,7 @@
 /*
- * $Id: cf_gen.cc,v 1.19 1997/12/03 01:30:39 wessels Exp $
+ * $Id: cf_gen.cc,v 1.20 1998/02/10 22:17:53 wessels Exp $
  *
- * DEBUG: section 1     Startup and Main Loop
+ * DEBUG: none
  * AUTHOR: Max Okumoto
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/

diff --git a/src/ipc.cc b/src/ipc.cc
index c79d912806a5b2ee770aac9614dbfd445babaa99..7a3c8cc63110cf0e022e95ee2c34b6af64ec63c8 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc.cc,v 1.3 1998/02/10 00:58:42 wessels Exp $
+ * $Id: ipc.cc,v 1.4 1998/02/10 22:17:53 wessels Exp $
  *
  * DEBUG: section 54    Interprocess Communication
  * AUTHOR: Duane Wessels
@@ -179,8 +179,8 @@ ipcCreate(int type, const char *prog, char *const args[], const char *name, int
            debug(50, 0) ("--> read: %s\n", xstrerror());
            return ipcCloseAllFD(prfd, pwfd, crfd, cwfd);
        } else if (strcmp(hello_buf, hello_string)) {
-           debug(50, 0) ("ipcCreate: PARENT: hello read test failed\n");
-           debug(50, 0) ("--> got '%s'\n", rfc1738_escape(hello_buf));
+           debug(54, 0) ("ipcCreate: PARENT: hello read test failed\n");
+           debug(54, 0) ("--> got '%s'\n", rfc1738_escape(hello_buf));
            return ipcCloseAllFD(prfd, pwfd, crfd, cwfd);
        }
        commSetTimeout(prfd, -1, NULL, NULL);

diff --git a/src/mem.cc b/src/mem.cc
index 2b8bb8b5f295a814a198b918e508c6c8cd66dde6..b005803778457a678989bd47a29249da77b2a4b8 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,8 +1,8 @@
 
 /*
- * $Id: mem.cc,v 1.2 1998/01/31 05:32:00 wessels Exp $
+ * $Id: mem.cc,v 1.3 1998/02/10 22:17:54 wessels Exp $
  *
- * DEBUG: section 19    Memory Primitives
+ * DEBUG: section 13    Memory Pool Management
  * AUTHOR: Harvest Derived
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/

diff --git a/src/multicast.cc b/src/multicast.cc
index 876ea384937f9a52c8016b6b744e876a6c450f02..39e6d9f74e3b3b58003289b5d475be60a17f148e 100644 (file)
--- a/src/multicast.cc
+++ b/src/multicast.cc
@@ -1,8 +1,8 @@
 
 /*
- * $Id: multicast.cc,v 1.4 1997/11/05 05:29:31 wessels Exp $
+ * $Id: multicast.cc,v 1.5 1998/02/10 22:17:54 wessels Exp $
  *
- * DEBUG: section 5     Socket Functions
+ * DEBUG: section 7     Multicast
  * AUTHOR: Martin Hamilton
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -53,22 +53,22 @@ mcastJoinGroups(const ipcache_addrs * ia, void *datanotused)
     int x;
     char c = 0;
     if (ia == NULL) {
-       debug(5, 0) ("comm_join_mcast_groups: Unknown host\n");
+       debug(7, 0) ("comm_join_mcast_groups: Unknown host\n");
        return;
     }
     for (i = 0; i < (int) ia->count; i++) {
-       debug(5, 10) ("Listening for ICP requests on %s\n",
+       debug(7, 10) ("Listening for ICP requests on %s\n",
            inet_ntoa(*(ia->in_addrs + i)));
        mr.imr_multiaddr.s_addr = (ia->in_addrs + i)->s_addr;
        mr.imr_interface.s_addr = INADDR_ANY;
        x = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
            (char *) &mr, sizeof(struct ip_mreq));
        if (x < 0)
-           debug(5, 1) ("comm_join_mcast_groups: FD %d, [%s]\n",
+           debug(7, 1) ("comm_join_mcast_groups: FD %d, [%s]\n",
                fd, inet_ntoa(*(ia->in_addrs + i)));
        x = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &c, 1);
        if (x < 0)
-           debug(5, 1) ("Can't disable multicast loopback: %s\n", xstrerror());
+           debug(7, 1) ("Can't disable multicast loopback: %s\n", xstrerror());
     }
 #endif
 }

diff --git a/src/stmem.cc b/src/stmem.cc
index 813968b4b4a300dac56a4362ffb291330db550cc..02cf0791526b722ab88c43a74dd6e22c7f32eb45 100644 (file)
--- a/src/stmem.cc
+++ b/src/stmem.cc
@@ -1,8 +1,8 @@
 
 /*
- * $Id: stmem.cc,v 1.57 1998/02/02 21:16:33 wessels Exp $
+ * $Id: stmem.cc,v 1.58 1998/02/10 22:17:55 wessels Exp $
  *
- * DEBUG: section 19    Memory Primitives
+ * DEBUG: section 19    Store Memory Primitives
  * AUTHOR: Harvest Derived
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/

diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index c5c9e1e5bf9f938016104b9d639092df80cf0aca..8bc18ac2942780985040d416bd2ac57efafa51ba 100644 (file)
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -1,7 +1,7 @@
 /*
- * $Id: unlinkd.cc,v 1.20 1998/02/10 02:47:35 wessels Exp $
+ * $Id: unlinkd.cc,v 1.21 1998/02/10 22:17:56 wessels Exp $
  *
- * DEBUG: section 43    Unlink Daemon
+ * DEBUG: section 12    Unlink Daemon
  * AUTHOR: Duane Wessels
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -111,7 +111,7 @@ unlinkdClose(void)
        debug_trap("unlinkdClose: unlinkd_wfd < 0");
        return;
     }
-    debug(43, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
+    debug(12, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
     file_close(unlinkd_wfd);
     file_close(unlinkd_rfd);
     unlinkd_wfd = -1;
@@ -145,7 +145,7 @@ unlinkdInit(void)
     commSetTimeout(unlinkd_wfd, -1, NULL, NULL);
     commSetNonBlocking(unlinkd_wfd);
     commSetNonBlocking(unlinkd_rfd);
-    debug(43, 0) ("Unlinkd pipe opened on FD %d\n", unlinkd_wfd);
+    debug(12, 0) ("Unlinkd pipe opened on FD %d\n", unlinkd_wfd);
 #endif
 }
 

diff --git a/src/urn.cc b/src/urn.cc
index a2a276ec451a614521af29dcb355fb692abed696..9b36f8fe9159803c92a756951fc312170109514e 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -1,6 +1,6 @@
 
 /*
- * DEBUG: section 51    URN Parsing
+ * DEBUG: section 52    URN Parsing
  * AUTHOR: Kostas Anagnostakis
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -52,21 +52,21 @@ urnFindMinRtt(wordlist * urls, method_t m, int *rtt_ret)
     int rtt;
     wordlist *w;
     wordlist *min_w = NULL;
-    debug(50, 3) ("urnFindMinRtt\n");
+    debug(52, 3) ("urnFindMinRtt\n");
     assert(urls != NULL);
     for (w = urls; w; w = w->next) {
        r = urlParse(m, w->key);
        if (r == NULL)
            continue;
-       debug(50, 3) ("Parsed %s\n", w->key);
+       debug(52, 3) ("Parsed %s\n", w->key);
        rtt = netdbHostRtt(r->host);
        if (rtt == 0) {
-           debug(50, 3) ("Pinging %s\n", r->host);
+           debug(52, 3) ("Pinging %s\n", r->host);
            netdbPingSite(r->host);
            memFree(MEM_REQUEST_T, r);
            continue;
        }
-       debug(50, 3) ("%s rtt=%d\n", r->host, rtt);
+       debug(52, 3) ("%s rtt=%d\n", r->host, rtt);
        if (rtt == 0)
            continue;
        if (rtt > min_rtt && min_rtt != 0)
@@ -77,7 +77,7 @@ urnFindMinRtt(wordlist * urls, method_t m, int *rtt_ret)
     }
     if (rtt_ret)
        *rtt_ret = min_rtt;
-    debug(50, 1) ("urnFindMinRtt: Returning '%s' RTT %d\n",
+    debug(52, 1) ("urnFindMinRtt: Returning '%s' RTT %d\n",
        min_w ? min_w->key : "NONE",
        min_rtt);
     return min_w;
@@ -93,7 +93,7 @@ urnStart(request_t * r, StoreEntry * e)
     char *host;
     UrnState *urnState;
     StoreEntry *urlres_e;
-    debug(50, 3) ("urnStart: '%s'\n", storeUrl(e));
+    debug(52, 3) ("urnStart: '%s'\n", storeUrl(e));
     urnState = xcalloc(1, sizeof(UrnState));
     urnState->entry = e;
     urnState->request = requestLink(r);
@@ -154,7 +154,7 @@ urnHandleReply(void *data, char *buf, ssize_t size)
     double tmprtt;
     StoreEntry *tmpentry;
 
-    debug(50, 3) ("urnHandleReply: Called with size=%d.\n", size);
+    debug(52, 3) ("urnHandleReply: Called with size=%d.\n", size);
     if (urlres_e->store_status == STORE_ABORTED) {
        memFree(MEM_4K_BUF, buf);
        return;
@@ -179,16 +179,16 @@ urnHandleReply(void *data, char *buf, ssize_t size)
     /* we know its STORE_OK */
     s = mime_headers_end(buf);
     if (s == NULL) {
-       debug(50, 1) ("urnHandleReply: didn't find end-of-headers for %s\n",
+       debug(52, 1) ("urnHandleReply: didn't find end-of-headers for %s\n",
            storeUrl(e));
        return;
     }
     assert(urlres_e->mem_obj->reply);
     httpParseReplyHeaders(buf, urlres_e->mem_obj->reply);
-    debug(50, 3) ("mem->reply exists, code=%d.\n",
+    debug(52, 3) ("mem->reply exists, code=%d.\n",
        urlres_e->mem_obj->reply->code);
     if (urlres_e->mem_obj->reply->code != HTTP_OK) {
-       debug(50, 3) ("urnHandleReply: failed.\n");
+       debug(52, 3) ("urnHandleReply: failed.\n");
        err = errorCon(ERR_URN_RESOLVE, HTTP_NOT_FOUND);
        err->request = requestLink(urnState->request);
        err->url = xstrdup(storeUrl(e));
@@ -199,7 +199,7 @@ urnHandleReply(void *data, char *buf, ssize_t size)
        s++;
     urls = urnParseReply(s);
     if (urls == NULL) {                /* unkown URN error */
-       debug(50, 3) ("urnTranslateDone: unknown URN %s\n", storeUrl(e));
+       debug(52, 3) ("urnTranslateDone: unknown URN %s\n", storeUrl(e));
        err = errorCon(ERR_URN_RESOLVE, HTTP_NOT_FOUND);
        err->request = requestLink(urnState->request);
        err->url = xstrdup(storeUrl(e));
@@ -242,7 +242,7 @@ urnHandleReply(void *data, char *buf, ssize_t size)
     storeAppend(e, hdr, strlen(hdr));
     httpParseReplyHeaders(hdr, e->mem_obj->reply);
     if (EBIT_TEST(urnState->flags, URN_FORCE_MENU)) {
-       debug(51, 3) ("urnHandleReply: forcing menu\n");
+       debug(52, 3) ("urnHandleReply: forcing menu\n");
     } else if (min_w) {
        l = snprintf(line, 4096, "Location: %s\r\n", min_w->key);
        storeAppend(e, line, l);
@@ -268,9 +268,9 @@ urnParseReply(const char *inbuf)
     wordlist *u;
     wordlist *head = NULL;
     wordlist **last = &head;
-    debug(50, 3) ("urnParseReply\n");
+    debug(52, 3) ("urnParseReply\n");
     for (token = strtok(buf, crlf); token; token = strtok(NULL, crlf)) {
-       debug(50, 3) ("urnParseReply: got '%s'\n", token);
+       debug(52, 3) ("urnParseReply: got '%s'\n", token);
        u = xmalloc(sizeof(wordlist));
        u->key = xstrdup(token);
        u->next = NULL;