[GNUnet-SVN] r3888 - gnunet-gtk/src/plugins/stats

[grothoff]

Author: grothoff
Date: 2006-12-07 00:43:42 -0800 (Thu, 07 Dec 2006)
New Revision: 3888

Modified:
   gnunet-gtk/src/plugins/stats/functions.c
   gnunet-gtk/src/plugins/stats/statistics.c
Log:
new stats fixes

Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c    2006-12-07 07:31:52 UTC (rev 
3887)
+++ gnunet-gtk/src/plugins/stats/functions.c    2006-12-07 08:43:42 UTC (rev 
3888)
@@ -225,7 +225,7 @@
   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 @@
   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 @@
   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 @@
   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],

Modified: gnunet-gtk/src/plugins/stats/statistics.c
===================================================================
--- gnunet-gtk/src/plugins/stats/statistics.c   2006-12-07 07:31:52 UTC (rev 
3887)
+++ gnunet-gtk/src/plugins/stats/statistics.c   2006-12-07 08:43:42 UTC (rev 
3888)
@@ -174,7 +174,7 @@
       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 @@
                                    "STATS-INTERVAL",
                                    1,
                                    99 * cronYEARS,
-                                   30 * cronSECONDS,
+                                   3 * cronSECONDS,
                                    &UPDATE_INTERVAL);
   init_functions(ectx,
                 cfg);