- log load statistics to file

4 files changed, 117 insertions, 35 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 4195ee366..a1c7f02be 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -2653,6 +2653,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GST_cache_clear ();
   GNUNET_TESTBED_operation_queue_destroy_ (GST_opq_openfds);
   GST_opq_openfds = NULL;
+  GST_stats_destroy ();
 }
 
 
@@ -2749,9 +2750,6 @@ testbed_run (void *cls, struct GNUNET_SERVER_Handle *server,
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
                                                         "HOSTNAME", &hostname));
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
-                                             "STATS_DIR", &GST_stats_dir));
   our_config = GNUNET_CONFIGURATION_dup (cfg);
   GNUNET_SERVER_add_handlers (server, message_handlers);
   GNUNET_SERVER_disconnect_notify (server, &client_disconnect_cb, NULL);
@@ -2762,6 +2760,7 @@ testbed_run (void *cls, struct GNUNET_SERVER_Handle *server,
                                                   &shutdown_task, NULL);
   LOG_DEBUG ("Testbed startup complete\n");
   event_mask = 1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED;
+  GST_stats_init (our_config);
 }
 
 
diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h
index da63475d6..700bbfcd8 100644
--- a/src/testbed/gnunet-service-testbed.h
+++ b/src/testbed/gnunet-service-testbed.h
@@ -947,4 +947,20 @@ GST_cache_get_handle_core (unsigned int peer_id,
 void
 GST_cache_get_handle_done (struct GSTCacheGetHandle *cgh);
 
+
+/**
+ * Initialize logging CPU and IO statisticfs.  Checks the configuration for
+ * "STATS_DIR" and logs to a file in that directory.  The file is name is
+ * generated from the hostname and the process's PID.
+ */
+void
+GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+
+/**
+ * Shutdown the status calls module.
+ */
+void
+GST_stats_destroy ();
+
 /* End of gnunet-service-testbed.h */
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 7692a1389..bb187e4d3 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -75,6 +75,15 @@ static int currentIOLoad;
 
 static double agedIOLoad = -1;
 
+
+/**
+ * hanlde to the file to write the load statistics to
+ */
+struct GNUNET_BIO_WriteHandle *bw;
+
+GNUNET_SCHEDULER_TaskIdentifier sample_load_task_id;
+
+
 #ifdef OSX
 static int
 initMachCpuStats ()
@@ -92,9 +101,7 @@ initMachCpuStats ()
                               &cpu_msg_count);
   if (kret != KERN_SUCCESS)
     {
-      GNUNET_GE_LOG (NULL,
-                     GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
-                     GNUNET_GE_BULK, "host_processor_info failed.");
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "host_processor_info failed.");
       return GNUNET_SYSERR;
     }
   prev_cpu_load = GNUNET_malloc (cpu_count * sizeof (*prev_cpu_load));
@@ -286,9 +293,7 @@ updateUsage ()
       }
     else
       {
-        GNUNET_GE_LOG (NULL,
-                       GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
-                       GNUNET_GE_BULK, "host_processor_info failed.");
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "host_processor_info failed.");
         return GNUNET_SYSERR;
       }
   }
@@ -312,10 +317,7 @@ updateUsage ()
     kc = kstat_open ();
     if (kc == NULL)
       {
-        GNUNET_GE_LOG_STRERROR (NULL,
-                                GNUNET_GE_ERROR | GNUNET_GE_USER |
-                                GNUNET_GE_ADMIN | GNUNET_GE_BULK,
-                                "kstat_open");
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kstat_close");        
         goto ABORT_KSTAT;
       }
 
@@ -340,9 +342,7 @@ updateUsage ()
           }
       }
     if (0 != kstat_close (kc))
-      GNUNET_GE_LOG_STRERROR (NULL,
-                              GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
-                              GNUNET_GE_USER | GNUNET_GE_BULK, "kstat_close");
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kstat_close");
     if ((idlecount == 0) && (totalcount == 0))
       goto ABORT_KSTAT;         /* no stats found => abort */
     deltaidle = idlecount - last_idlecount;
@@ -446,10 +446,8 @@ updateUsage ()
           if (once == 0)
             {
               once = 1;
-              GNUNET_GE_LOG (NULL,
-                             GNUNET_GE_ERROR | GNUNET_GE_USER |
-                             GNUNET_GE_ADMIN | GNUNET_GE_BULK,
-                             _("Cannot query the CPU usage (Windows NT).\n"));
+              GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                          "Cannot query the CPU usage (Windows NT).\n");
             }
           return GNUNET_SYSERR;
         }
@@ -469,10 +467,8 @@ updateUsage ()
           if (once == 0)
             {
               once = 1;
-              GNUNET_GE_LOG (NULL,
-                             GNUNET_GE_USER | GNUNET_GE_ADMIN |
-                             GNUNET_GE_ERROR | GNUNET_GE_BULK,
-                             _("Cannot query the CPU usage (Win 9x)\n"));
+              GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                          "Cannot query the CPU usage (Win 9x)\n");
             }
         }
 
@@ -580,8 +576,8 @@ updateAgedLoad ()
  * @return the CPU load as a percentage of allowed
  *        (100 is equivalent to full load)
  */
-int
-GST_cpu_get_load ()
+static int
+cpu_get_load ()
 {
   updateAgedLoad ();
   return (int) agedCPULoad;
@@ -593,21 +589,85 @@ GST_cpu_get_load ()
  * @return the CPU load as a percentage of allowed
  *        (100 is equivalent to full load)
  */
-int
-GST_disk_get_load ()
+static int
+disk_get_load ()
 {
   updateAgedLoad ();
   return (int) agedIOLoad;
 }
 
+
+static void
+sample_load_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GNUNET_TIME_Absolute now;
+  char *str;
+  int nbs;
+  int ld_cpu;
+  int ld_disk;
+
+  sample_load_task_id = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+    return;
+  ld_cpu = cpu_get_load ();
+  ld_disk = disk_get_load ();
+  if ( (-1 == ld_cpu) || (-1 == ld_disk) )
+    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 ());
+  if (0 < nbs) 
+  {
+    GNUNET_BIO_write (bw, str, nbs);
+    GNUNET_free (str);
+  }
+  else
+    GNUNET_break (0);
+
+ reschedule:
+  sample_load_task_id =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                    &sample_load_task, NULL);
+}
+
+
 /**
- * The following method is called in order to initialize the status calls
- * routines.  After that it is safe to call each of the status calls separately
- * @return GNUNET_OK on success and GNUNET_SYSERR on error (or calls errexit).
+ * Initialize logging CPU and IO statisticfs.  Checks the configuration for
+ * "STATS_DIR" and logs to a file in that directory.  The file is name is
+ * generated from the hostname and the process's PID.
  */
 void
-GST_stats_init ()
+GST_stats_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  char *hostname;
+  char *stats_dir;
+  char *fn;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
+                                             "STATS_DIR", &stats_dir))
+    return;
+  hostname = GNUNET_malloc (GNUNET_OS_get_hostname_max_length ());
+  if (0 != gethostname  (hostname, GNUNET_OS_get_hostname_max_length ()))
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "gethostname");
+    GNUNET_free (stats_dir);
+    return;
+  }
+  fn = NULL;  
+  (void) GNUNET_asprintf (&fn, "%s/%s-%jd.dat", stats_dir, 
+                          hostname, (intmax_t) getpid());
+  GNUNET_free (stats_dir);
+  if (NULL == (bw = GNUNET_BIO_write_open (fn)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Cannot open %s for writing load statistics.  "
+                  "Not logging load statistics\n"), fn);
+    GNUNET_free (fn);
+    return;
+  }
+  GNUNET_free (fn);
+  sample_load_task_id = GNUNET_SCHEDULER_add_now (&sample_load_task, NULL);
 #ifdef LINUX
   proc_stat = fopen ("/proc/stat", "r");
   if (NULL == proc_stat)
@@ -619,14 +679,18 @@ GST_stats_init ()
   InitWinEnv (NULL);
 #endif
   updateUsage ();               /* initialize */
+  
 }
 
+
 /**
  * Shutdown the status calls module.
  */
 void
 GST_stats_destroy ()
 {
+  if (NULL == bw)
+    return;
 #ifdef LINUX
   if (proc_stat != NULL)
     {
@@ -638,8 +702,8 @@ GST_stats_destroy ()
 #elif MINGW
   ShutdownWinEnv ();
 #endif
+  GNUNET_break (GNUNET_OK == GNUNET_BIO_write_close (bw));
+  bw = NULL;
 }
 
-char *GST_stats_dir;
-
 /* end of cpustatus.c */
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 5f91958ba..9dc269e5c 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -44,4 +44,7 @@ MAX_OPEN_FDS = 512
 
 # How long should we wait for testbed to setup while using helper functions
 # GNUNET_TESTBED_test_run() and GNUNET_TESTBED_run()
-SETUP_TIMEOUT = 5 m
\ No newline at end of file
+SETUP_TIMEOUT = 5 m
+
+# Where should testbed write load statistics data
+# STATS_DIR = /tmp/load
\ No newline at end of file