Added :

	Request Hit Ratio
	Byte Hit Ratio
	Number of Clients

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index f5abcf001da4f5fc4877783db5a3c1b1d0f3db23..5ae680b8bc30fa0907ea1bf68359bcac7ffac65e 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_snmp.h,v 1.19 1998/11/17 23:16:46 glenn Exp $
+ * $Id: cache_snmp.h,v 1.20 1998/11/18 00:16:37 glenn Exp $
  */
 
 #ifdef SQUID_SNMP
@@ -217,6 +217,7 @@ enum {
     PERF_PROTOSTAT_AGGR_KBYTES_IN,
     PERF_PROTOSTAT_AGGR_KBYTES_OUT,
     PERF_PROTOSTAT_AGGR_CURSWAP,
+    PERF_PROTOSTAT_AGGR_CLIENTS,
     PERF_PROTOSTAT_AGGR_END
 };
 
@@ -230,6 +231,8 @@ enum {
     PERF_MEDIAN_ICP_QUERY,
     PERF_MEDIAN_ICP_REPLY,
     PERF_MEDIAN_DNS,
+    PERF_MEDIAN_RHR,
+    PERF_MEDIAN_BHR,
     PERF_MEDIAN_END
 };
 

diff --git a/src/mib.txt b/src/mib.txt
index 87f404fe4beb282dea8e9d8225817eecda921db3..92f8aa52ed384bf80130677df94d19939a6fb172 100644 (file)
--- a/src/mib.txt
+++ b/src/mib.txt
@@ -1,6 +1,6 @@
 SQUID-MIB  DEFINITIONS ::= BEGIN
 --
--- $Id: mib.txt,v 1.20 1998/11/17 23:16:49 glenn Exp $
+-- $Id: mib.txt,v 1.21 1998/11/18 00:16:37 glenn Exp $
 --
 
 IMPORTS
@@ -356,6 +356,11 @@ squid MODULE-IDENTITY
                 STATUS current
         ::= { cacheProtoAggregateStats 14 }
 
+       cacheClients OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 15 }
 
        --
        -- cacheProtoMedianSvcStats group
@@ -437,6 +442,18 @@ squid MODULE-IDENTITY
                 STATUS current
         ::= { cacheMedianSvcEntry 8 } 
 
+        cacheRequestHitRatio OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 9 }
+
+        cacheRequestByteRatio OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 10 }
+
 --
 -- cacheNetwork group
 --

diff --git a/src/protos.h b/src/protos.h
index 1ca124bd5480f7676caa6208d551812de763b48e..d3f053bd091b857f03685fc7316413c3b8f1d8f7 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.289 1998/11/13 21:02:08 rousskov Exp $
+ * $Id: protos.h,v 1.290 1998/11/18 00:16:38 glenn Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -683,6 +683,9 @@ extern void pconnHistCount(int, int);
 extern int stat5minClientRequests(void);
 extern double stat5minCPUUsage(void);
 extern const char *storeEntryFlags(const StoreEntry *);
+extern double statRequestHitRatio(int minutes);
+extern double statByteHitRatio(int minutes);
+
 
 
 /* StatHist */

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index e7cf55dbdb30bc2b50f53a9d873ae378ae92fab9..b81c33dc81a6735f5d25a2fbf1ef1c33b47571eb 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.59 1998/11/11 20:04:18 glenn Exp $
+ * $Id: snmp_agent.cc,v 1.60 1998/11/18 00:16:39 glenn Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
@@ -420,6 +420,9 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
        case PERF_PROTOSTAT_AGGR_CURSWAP:
            *(Answer->val.integer) = (snint) store_swap_size;
            break;
+        case PERF_PROTOSTAT_AGGR_CLIENTS:
+            *(Answer->val.integer) = (snint) Counter.client_http.clients;
+            break;
        default:
            *ErrP = SNMP_ERR_NOSUCHNAME;
            snmp_var_free(Answer);
@@ -469,6 +472,12 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
        case PERF_MEDIAN_DNS:
            x = statHistDeltaMedian(&l->dns.svc_time, &f->dns.svc_time);
            break;
+        case PERF_MEDIAN_RHR:
+            x = statRequestHitRatio(minutes) * 100;
+            break;
+        case PERF_MEDIAN_BHR:
+            x = statByteHitRatio(minutes) * 100;
+            break;
        default:
            *ErrP = SNMP_ERR_NOSUCHNAME;
            snmp_var_free(Answer);

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 1eaf3e0b79a2091d6ebe8ed4b23ccbd152c4cb63..8443442adef54447fc2c97484d189dee7268b212 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: snmp_core.cc,v 1.17 1998/11/17 23:16:49 glenn Exp $
+ * $Id: snmp_core.cc,v 1.18 1998/11/18 00:16:39 glenn Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -179,7 +179,7 @@ snmpInit(void)
                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 1, SQ_PRF, 2),
                                            LEN_SQ_PRF + 1, NULL, 2,
                                            snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 2, 1),
-                                               LEN_SQ_PRF + 2, NULL, 14,
+                                               LEN_SQ_PRF + 2, NULL, 15,
                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 1),
                                                    LEN_SQ_PRF + 3, snmp_prfProtoFn, 0),
                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 2),
@@ -206,12 +206,14 @@ snmpInit(void)
                                                    LEN_SQ_PRF + 3, snmp_prfProtoFn, 0),
                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 13),
                                                    LEN_SQ_PRF + 3, snmp_prfProtoFn, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 14),
+                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 14),
+                                                    LEN_SQ_PRF + 3, snmp_prfProtoFn, 0),
+                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 1, 15),
                                                    LEN_SQ_PRF + 3, snmp_prfProtoFn, 0)),
                                            snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, 2, 2),
                                                LEN_SQ_PRF + 2, NULL, 1,
                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, 2, 2, 1),
-                                                   LEN_SQ_PRF + 3, NULL, 8,
+                                                   LEN_SQ_PRF + 3, NULL, 10,
                                                    snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 2, 1, 1),
                                                        LEN_SQ_PRF + 4, NULL, 3,
                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 1, 1),
@@ -268,13 +270,29 @@ snmpInit(void)
                                                             LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),  
                                                         snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 7, 60),  
                                                             LEN_SQ_PRF + 5, snmp_prfProtoFn, 0)),
-                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 2, 1, 8),
-                                                       LEN_SQ_PRF + 4, NULL, 3,
+                                                    snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 2, 1, 8),
+                                                        LEN_SQ_PRF + 4, NULL, 3,
                                                         snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 8, 1),
                                                             LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),
                                                         snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 8, 5),
-                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),  
-                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 8, 60),  
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 8, 60),
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0)),
+                                                    snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 2, 1, 9),
+                                                        LEN_SQ_PRF + 4, NULL, 3,
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 9, 1),
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 9, 5),
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 9, 60),
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0)),
+                                                    snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, 2, 2, 1, 10),
+                                                        LEN_SQ_PRF + 4, NULL, 3,
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 10, 1),
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 10, 5),
+                                                            LEN_SQ_PRF + 5, snmp_prfProtoFn, 0),
+                                                        snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 5, SQ_PRF, 2, 2, 1, 10, 60),
                                                             LEN_SQ_PRF + 5, snmp_prfProtoFn, 0)))))),
                                    snmpAddNode(snmpCreateOid(LEN_SQ_NET, SQ_NET),
                                        LEN_SQ_NET, NULL, 3,

diff --git a/src/stat.cc b/src/stat.cc
index 0d76f39edd28595193a40756794c58ea02d0fb00..d8742b570f42edb05753c5efe141e9acd082e1f2 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.299 1998/11/13 21:02:10 rousskov Exp $
+ * $Id: stat.cc,v 1.300 1998/11/18 00:16:40 glenn Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -76,8 +76,6 @@ static OBJH statAvg5min;
 static OBJH statAvg60min;
 static OBJH statUtilization;
 static OBJH statCountersHistograms;
-static double statRequestHitRatio(int minutes);
-static double statByteHitRatio(int minutes);
 
 #ifdef XMALLOC_STATISTICS
 static void info_get_mallstat(int, int, StoreEntry *);
@@ -1253,7 +1251,7 @@ statCPUUsage(int minutes)
        tvSubDsec(CountHist[minutes].timestamp, CountHist[0].timestamp));
 }
 
-static double
+extern double
 statRequestHitRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1263,7 +1261,7 @@ statRequestHitRatio(int minutes)
        CountHist[minutes].client_http.requests);
 }
 
-static double
+extern double
 statByteHitRatio(int minutes)
 {
     size_t s;