date: 2003/01/21 00:47:51; author: wessels; state: Exp; lines: +2 -1

in clientUpdateHierCounters() CLOSEST_PARENT_MISS and FIRST_PARENT_MISS
are actually ICP-related codes.
date: 2003/01/27 03:29:37;  author: wessels;  state: Exp;  lines: +1 -0
was missing CD_SIBLING_HIT case when we should have been
incrementing statCounter.cd.times_used.

diff --git a/src/client_side.cc b/src/client_side.cc
index 6a58b0cb04b11f52d46e79d55644de05168fa35a..1fdb43a482652f85616d12812d9912ef5c6a3a02 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.612 2003/01/23 00:37:17 robertc Exp $
+ * $Id: client_side.cc,v 1.613 2003/01/27 08:06:57 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -353,11 +353,16 @@ void
 clientUpdateHierCounters(HierarchyLogEntry * someEntry)
 {
     ping_data *i;
-    switch (someEntry->alg) {
-    case PEER_SA_DIGEST:
+    switch (someEntry->code) {
+#if USE_CACHE_DIGESTS
+    case CD_PARENT_HIT:
        statCounter.cd.times_used++;
        break;
-    case PEER_SA_ICP:
+#endif
+    case SIBLING_HIT:
+    case PARENT_HIT:
+    case FIRST_PARENT_MISS:
+    case CLOSEST_PARENT_MISS:
        statCounter.icp.times_used++;
        i = &someEntry->ping;
        if (clientPingHasFinished(i))
@@ -366,7 +371,8 @@ clientUpdateHierCounters(HierarchyLogEntry * someEntry)
        if (i->timeout)
            statCounter.icp.query_timeouts++;
        break;
-    case PEER_SA_NETDB:
+    case CLOSEST_PARENT:
+    case CLOSEST_DIRECT:
        statCounter.netdb.times_used++;
        break;
     default:

diff --git a/src/enums.h b/src/enums.h
index b66a728bdd51f03b54ed3ef2e7de0a6560b6fbf6..8045f95dcee13b5b8cdc67e961d7fe7a2729a6a3 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.219 2003/01/23 00:37:20 robertc Exp $
+ * $Id: enums.h,v 1.220 2003/01/27 08:06:57 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -172,13 +172,6 @@ typedef enum {
     PEER_MULTICAST
 } peer_t;
 
-typedef enum {
-    PEER_SA_NONE,
-    PEER_SA_DIGEST,
-    PEER_SA_ICP,
-    PEER_SA_NETDB
-} peer_select_alg_t;
-
 typedef enum {
     LOOKUP_NONE,
     LOOKUP_HIT,