fix five-min average stuff

diff --git a/src/stat.cc b/src/stat.cc
index ee48f62590efae9393def98a8d3e3b2eadecba09..4c02bc687b033f99dd54e42450bd7b437a70380d 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.180 1998/01/05 00:45:48 wessels Exp $
+ * $Id: stat.cc,v 1.181 1998/01/05 05:14:16 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -125,9 +125,9 @@ static void info_get_mallstat(int, int, StoreEntry *);
 int client_pconn_hist[PCONN_HIST_SZ];
 int server_pconn_hist[PCONN_HIST_SZ];
 
-#define N_DELTAS 5
-static StatCounters Deltas[N_DELTAS];
-static int NDeltas = 0;
+#define N_COUNT_HIST 5
+static StatCounters CountHist[N_COUNT_HIST];
+static int NCountHist = 0;
 
 /* process utilization information */
 static void
@@ -907,90 +907,71 @@ pconnHistDump(StoreEntry * e)
 void
 statAvgInit(void)
 {
-    memset(Deltas, '\0', N_DELTAS * sizeof(StatCounters));
+    int i;
+    memset(CountHist, '\0', N_COUNT_HIST * sizeof(StatCounters));
+    for (i=0; i<N_COUNT_HIST; i++)
+       CountHist[i].timestamp = current_time;
     eventAdd("statAvgTick", statAvgTick, NULL, 60);
 }
 
 static void
 statAvgTick(void *notused)
 {
-    StatCounters *t = &Deltas[0];
-    StatCounters *p = &Deltas[1];
+    StatCounters *t = &CountHist[0];
+    StatCounters *p = &CountHist[1];
     StatCounters *c = &Counter;
     struct rusage rusage;
     eventAdd("statAvgTick", statAvgTick, NULL, 60);
-    memmove(p, t, (N_DELTAS - 1) * sizeof(StatCounters));
     squid_getrusage(&rusage);
     c->page_faults = rusage_pagefaults(&rusage);
     c->cputime = rusage_cputime(&rusage);
-    t->client_http.requests = c->client_http.requests - p->client_http.requests;
-    t->client_http.hits = c->client_http.hits - p->client_http.hits;
-    t->client_http.errors = c->client_http.errors - p->client_http.errors;
-    t->client_http.bytes_in = c->client_http.bytes_in - p->client_http.bytes_in;
-    t->client_http.bytes_out = c->client_http.bytes_out - p->client_http.bytes_out;
-    t->icp.pkts_sent = c->icp.pkts_sent - p->icp.pkts_sent;
-    t->icp.pkts_recv = c->icp.pkts_recv - p->icp.pkts_recv;
-    t->icp.bytes_sent = c->icp.bytes_sent - p->icp.bytes_sent;
-    t->icp.bytes_recv = c->icp.bytes_recv - p->icp.bytes_recv;
-    t->unlink.requests = c->unlink.requests - p->unlink.requests;
-    t->page_faults = c->page_faults - p->page_faults;
-    t->select_loops = c->select_loops - p->select_loops;
-    t->cputime = c->cputime - p->cputime;
-    NDeltas++;
+    c->timestamp = current_time;
+    memmove(p, t, (N_COUNT_HIST - 1) * sizeof(StatCounters));
+    memcpy(t, c, sizeof(StatCounters));
+    NCountHist++;
 }
 
 void
 statAvgDump(StoreEntry * sentry)
 {
-    int i;
-    int N = NDeltas > N_DELTAS ? N_DELTAS : NDeltas;
-    StatCounters A;
-    StatCounters *c;
-    memset(&A, '\0', sizeof(StatCounters));
-    for (i = 0; i < N; i++) {
-       c = &Deltas[i];
-       A.client_http.requests += c->client_http.requests;
-       A.client_http.hits += c->client_http.hits;
-       A.client_http.errors += c->client_http.errors;
-       A.client_http.bytes_in += c->client_http.bytes_in;
-       A.client_http.bytes_out += c->client_http.bytes_out;
-       A.icp.pkts_sent += c->icp.pkts_sent;
-       A.icp.pkts_recv += c->icp.pkts_recv;
-       A.icp.bytes_sent += c->icp.bytes_sent;
-       A.icp.bytes_recv += c->icp.bytes_recv;
-       A.unlink.requests += c->unlink.requests;
-       A.page_faults += c->page_faults;
-       A.select_loops += c->select_loops;
-       A.cputime += c->cputime;
-    }
-    if (N) {
-       A.client_http.requests /= N;
-       A.client_http.hits /= N;
-       A.client_http.errors /= N;
-       A.client_http.bytes_in /= N;
-       A.client_http.bytes_out /= N;
-       A.icp.pkts_sent /= N;
-       A.icp.pkts_recv /= N;
-       A.icp.bytes_sent /= N;
-       A.icp.bytes_recv /= N;
-       A.unlink.requests /= N;
-       A.page_faults /= N;
-       A.select_loops /= N;
-       A.cputime /= N;
-    }
+    StatCounters *f = &CountHist[0];
+    StatCounters *l = &CountHist[N_COUNT_HIST - 1];
+    double dt;
+    double ct;
+    eventDelete(statAvgTick, NULL);
+    statAvgTick(NULL);
+    dt = tvSubDsec(l->timestamp, f->timestamp);
+    ct = f->cputime - l->cputime;
+debug(0,0)("statAvgDump: dt=%f\n", dt);
+debug(0,0)("statAvgDump: ct=%f\n", ct);
+#define XAVG(X) (double) (f->X - l->X) / dt
     storeBuffer(sentry);
-    storeAppendPrintf(sentry, "client_http.requests = %d\n", A.client_http.requests);
-    storeAppendPrintf(sentry, "client_http.hits = %d\n", A.client_http.hits);
-    storeAppendPrintf(sentry, "client_http.errors = %d\n", A.client_http.errors);
-    storeAppendPrintf(sentry, "client_http.bytes_in = %d\n", A.client_http.bytes_in);
-    storeAppendPrintf(sentry, "client_http.bytes_out = %d\n", A.client_http.bytes_out);
-    storeAppendPrintf(sentry, "icp.pkts_sent = %d\n", A.icp.pkts_sent);
-    storeAppendPrintf(sentry, "icp.pkts_recv = %d\n", A.icp.pkts_recv);
-    storeAppendPrintf(sentry, "icp.bytes_sent = %d\n", A.icp.bytes_sent);
-    storeAppendPrintf(sentry, "icp.bytes_recv = %d\n", A.icp.bytes_recv);
-    storeAppendPrintf(sentry, "unlink.requests = %d\n", A.unlink.requests);
-    storeAppendPrintf(sentry, "page_faults = %d\n", A.page_faults);
-    storeAppendPrintf(sentry, "select_loops = %d\n", A.select_loops);
-    storeAppendPrintf(sentry, "cputime = %f seconds\n", A.cputime);
+    storeAppendPrintf(sentry, "client_http.requests = %f/sec\n",
+       XAVG(client_http.requests));
+    storeAppendPrintf(sentry, "client_http.hits = %f/sec\n",
+       XAVG(client_http.hits));
+    storeAppendPrintf(sentry, "client_http.errors = %f/sec\n",
+       XAVG(client_http.errors));
+    storeAppendPrintf(sentry, "client_http.bytes_in = %f/sec\n",
+       XAVG(client_http.bytes_in));
+    storeAppendPrintf(sentry, "client_http.bytes_out = %f/sec\n",
+       XAVG(client_http.bytes_out));
+    storeAppendPrintf(sentry, "icp.pkts_sent = %f/sec\n",
+       XAVG(icp.pkts_sent));
+    storeAppendPrintf(sentry, "icp.pkts_recv = %f/sec\n",
+       XAVG(icp.pkts_recv));
+    storeAppendPrintf(sentry, "icp.bytes_sent = %f/sec\n",
+       XAVG(icp.bytes_sent));
+    storeAppendPrintf(sentry, "icp.bytes_recv = %f/sec\n",
+       XAVG(icp.bytes_recv));
+    storeAppendPrintf(sentry, "unlink.requests = %f/sec\n",
+       XAVG(unlink.requests));
+    storeAppendPrintf(sentry, "page_faults = %f/sec\n",
+       XAVG(page_faults));
+    storeAppendPrintf(sentry, "select_loops = %f/sec\n",
+       XAVG(select_loops));
+    storeAppendPrintf(sentry, "cpu_time = %f seconds\n", ct);
+    storeAppendPrintf(sentry, "wall_time = %f seconds\n", dt);
+    storeAppendPrintf(sentry, "cpu_usage %f%%\n", 100.0*ct/dt);
     storeBufferFlush(sentry);
 }

diff --git a/src/structs.h b/src/structs.h
index 8c0d7f6fb82f918287574ee2a5cce1c0bb16e2d0..fa8e6da6b22837f90df4d01cbe166905f9f7714a 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -979,4 +979,5 @@ struct _StatCounters {
     int page_faults;
     int select_loops;
     double cputime;
+    struct timeval timestamp;
 };