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

[grothoff]

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

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

Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c    2006-12-07 08:50:57 UTC (rev 
3891)
+++ gnunet-gtk/src/plugins/stats/functions.c    2006-12-07 08:54:42 UTC (rev 
3892)
@@ -127,16 +127,30 @@
   return OK;
 }
 
-static int getCPULoadStat(const void * closure,
+static int getLoadStat(const void * closure,
                          gfloat ** data) {
-  long long val;
+  long long valc;
+  long long valu;
+  long long vald;
 
-  if (OK != getStatValue(&val,
+  if (OK != getStatValue(&valc,
                         NULL,
                         NULL,
                        "% of allowed cpu load"))
     return SYSERR;
-  data[0][0] = (gfloat) val / 100.0;
+  if (OK != getStatValue(&valu,
+                        NULL,
+                        NULL,
+                       "% of allowed network load (up)"))
+    return SYSERR;
+  if (OK != getStatValue(&vald,
+                        NULL,
+                        NULL,
+                       "% of allowed network load (down)"))
+    return SYSERR;
+  data[0][0] = (gfloat) valc / 100.0;
+  data[0][1] = (gfloat) valu / 100.0;
+  data[0][2] = (gfloat) vald / 100.0;
   return OK;
 }
 
@@ -479,9 +493,9 @@
     NO,
   },
   {
-    gettext_noop("CPU load"),
-    gettext_noop("CPU load (in percent of allowed load)"),
-    &getCPULoadStat,
+    gettext_noop("System load"),
+    gettext_noop("CPU load (red), Network upload (green), Network download 
(yellow)"),
+    &getLoadStat,
     NULL,
     1,
     NO,

Modified: gnunet-gtk/src/plugins/stats/statistics.c
===================================================================
--- gnunet-gtk/src/plugins/stats/statistics.c   2006-12-07 08:50:57 UTC (rev 
3891)
+++ gnunet-gtk/src/plugins/stats/statistics.c   2006-12-07 08:54:42 UTC (rev 
3892)
@@ -441,7 +441,7 @@
                                    "STATS-INTERVAL",
                                    1,
                                    99 * cronYEARS,
-                                   30 * cronSECONDS,
+                                   3 * cronSECONDS,
                                    &UPDATE_INTERVAL);
   init_functions(ectx,
                 cfg);