From fb7976ee8707f6ff6908732b1f999963dde03ff9 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 7 Dec 2006 08:43:42 +0000
Subject: new stats fixes

---
 src/plugins/stats/functions.c  | 8 ++++----
 src/plugins/stats/statistics.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 08bb125c..851d544b 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -225,7 +225,7 @@ static int getTrafficRecvStats(const void * closure,
   if (OK != getStatValue(&rlimit,
 			 &lrlimit,
 			 NULL,
-			 "# total advertised bytes per minute received limit")) {
+			 "# total advertised bytes per second received limit")) {
     rlimit = 0;
     lrlimit = 0;
   }
@@ -252,7 +252,7 @@ static int getTrafficRecvStats(const void * closure,
   data[0][2] = ((gfloat)(queries+content+noise)) / (banddown * dtime / cronSECONDS); /* yellow */
   data[0][3] = ((gfloat)(queries+content+noise+hellos)) / (banddown * dtime / cronSECONDS); /* blue */
   data[0][4] = ((gfloat) total) / (banddown * dtime / cronSECONDS); /* gray */
-  data[0][5] = ((gfloat) rlimit) / (banddown * dtime / cronSECONDS); /* magenta */
+  data[0][5] = (gfloat) rlimit  / banddown; /* magenta */
 #if 0
   printf("I: %f %f %f %f\n",
 	 data[0][0],
@@ -326,7 +326,7 @@ static int getTrafficSendStats(const void * closure,
   if (OK != getStatValue(&slimit,
 			 &lslimit,
 			 NULL,
-			 "# total allowed bytes per minute transmission limit")) {
+			 "# total allowed bytes per second transmission limit")) {
     slimit = 0;
     lslimit = 0;
   }
@@ -352,7 +352,7 @@ static int getTrafficSendStats(const void * closure,
   data[0][2] = ((gfloat) (noise + content + queries)) / (bandup*dtime / cronSECONDS); /* yellow */
   data[0][3] = ((gfloat) (noise + content + queries + hellos)) / (bandup*dtime / cronSECONDS); /* blue */
   data[0][4] = ((gfloat) total) / (bandup*dtime / cronSECONDS); /* grey */
-  data[0][5] = ((gfloat) slimit) / (bandup*dtime / cronSECONDS); /* magenta */
+  data[0][5] = ((gfloat) slimit) / bandup ; /* magenta */
 #if 0
   printf("O: %f %f %f %f\n",
 	 data[0][0],
diff --git a/src/plugins/stats/statistics.c b/src/plugins/stats/statistics.c
index 5852c79a..7e22d284 100644
--- a/src/plugins/stats/statistics.c
+++ b/src/plugins/stats/statistics.c
@@ -174,7 +174,7 @@ static void load_graph_draw(LoadGraph *g) {
       gint y2 = g->data[i+1][j] / max * g->draw_height - 1;
 
       if ((g->data[i][j] != -1) && (g->data[i+1][j] != -1)) {
-	if (stats[g->statIdx].fill <= i) {
+	if (stats[g->statIdx].fill <= j) {
 	  gdk_draw_line(g->pixmap, g->gc,
 			g->draw_width - x2,
 			g->draw_height - y2,
@@ -441,7 +441,7 @@ void init_stats(struct GE_Context * ectx,
 				    "STATS-INTERVAL",
 				    1,
 				    99 * cronYEARS,
-				    30 * cronSECONDS,
+				    3 * cronSECONDS,
 				    &UPDATE_INTERVAL);
   init_functions(ectx,
 		 cfg);
-- 
cgit v1.2.3