[GNUnet-SVN] r26763 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-04-04 16:51:05 +0200 (Thu, 04 Apr 2013)
New Revision: 26763

Modified:
   gnunet/src/testbed/gnunet-service-testbed_cpustatus.c
Log:
- fix


Modified: gnunet/src/testbed/gnunet-service-testbed_cpustatus.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_cpustatus.c       2013-04-04 
13:59:08 UTC (rev 26762)
+++ gnunet/src/testbed/gnunet-service-testbed_cpustatus.c       2013-04-04 
14:51:05 UTC (rev 26763)
@@ -615,7 +615,7 @@
     goto reschedule;
   now = GNUNET_TIME_absolute_get ();
   nbs = GNUNET_asprintf (&str, "%llu %d %d\n", now.abs_value / 1000,
-                         cpu_get_load (), disk_get_load ());
+                         ld_cpu, ld_disk);
   if (0 < nbs) 
   {
     GNUNET_BIO_write (bw, str, nbs);
@@ -707,6 +707,11 @@
 #elif OSX
   GNUNET_free_non_null (prev_cpu_load);
 #endif
+  if (GNUNET_SCHEDULER_NO_TASK != sample_load_task_id)
+  {
+    GNUNET_SCHEDULER_cancel (sample_load_task_id);
+    sample_load_task_id = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_break (GNUNET_OK == GNUNET_BIO_write_close (bw));
   bw = NULL;
 }