[GNUnet-SVN] r4976 - in GNUnet: . src/applications/stats

[gnunet]

Author: grothoff
Date: 2007-06-08 23:50:33 -0600 (Fri, 08 Jun 2007)
New Revision: 4976

Modified:
   GNUnet/src/applications/stats/statistics.c
   GNUnet/todo
Log:
fx

Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c  2007-06-09 05:44:49 UTC (rev 
4975)
+++ GNUnet/src/applications/stats/statistics.c  2007-06-09 05:50:33 UTC (rev 
4976)
@@ -232,21 +232,35 @@
 }
 
 static void immediateUpdates() {
+  int load;
+
 #if HAVE_SQSTATS
   update_sqstore_stats();
 #endif
+  load = os_cpu_get_load(coreAPI->ectx,
+                        coreAPI->cfg);
+  if (load == -1)
+    load = 0;
   statSet(stat_handle_cpu_load,
-         os_cpu_get_load(coreAPI->ectx,
-                         coreAPI->cfg));
+         load);
+  load = os_disk_get_load(coreAPI->ectx,
+                         coreAPI->cfg);
+  if (load == -1)
+    load = 0;
   statSet(stat_handle_io_load,
-         os_disk_get_load(coreAPI->ectx,
-                          coreAPI->cfg));
+         load);
+  load = os_network_monitor_get_load(coreAPI->load_monitor,
+                                    Upload);
+  if (load == -1)
+    load = 0;
   statSet(stat_handle_network_load_up,
-         os_network_monitor_get_load(coreAPI->load_monitor,
-                                     Upload));
+         load);
+  load = os_network_monitor_get_load(coreAPI->load_monitor,
+                                    Download);
+  if (load == -1)
+    load = 0;
   statSet(stat_handle_network_load_down,
-         os_network_monitor_get_load(coreAPI->load_monitor,
-                                     Download));
+         load);
   statSet(stat_connected,
          coreAPI->forAllConnectedNodes(NULL, NULL));
 }

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2007-06-09 05:44:49 UTC (rev 4975)
+++ GNUnet/todo 2007-06-09 05:50:33 UTC (rev 4976)
@@ -8,7 +8,6 @@
 - new features:
   * HTTP transport (libcurl, libmicrohttpd) [#765] [likely 0.7.2a]
 - RC bugs:
-  * huge number % allowed network load down in stats
   * UDP assertion failure (mtu < size) [#1209]
   * low connectivity (NAT? real issue?)
     - session keys sent to wrong peers? => assertions added