- Add periodic statistic readings to output

[oweals/gnunet.git] / src / nse / gnunet-nse-profiler.c

diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index d097b96aa0992dbf830b5867c0f36c6bf194ff27..37e5ecfbd7950c5a77b4dcc44b7e3cb5405db5f5 100644 (file)
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -29,7 +29,7 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_nse_service.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE 3
 
 struct NSEPeer
 {
@@ -40,6 +40,8 @@ struct NSEPeer
   struct GNUNET_TESTING_Daemon *daemon;
 
   struct GNUNET_NSE_Handle *nse_handle;
+
+  struct GNUNET_STATISTICS_Handle *stats;
 };
 
 
@@ -137,8 +139,6 @@ static GNUNET_SCHEDULER_TaskIdentifier churn_task;
 
 static char *topology_file;
 
-static uint64_t clock_skew;
-
 /**
  * Check whether peers successfully shut down.
  */
@@ -228,7 +228,87 @@ handle_estimate (void *cls, struct GNUNET_TIME_Absolute timestamp,
 
 }
 
+/**
+ * Process core statistic values.
+ *
+ * @param cls closure
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ */
+static int
+core_stats_iterator (void *cls, const char *subsystem, const char *name,
+                     uint64_t value, int is_persistent)
+{
+  struct NSEPeer *peer = cls;
+  char *output_buffer;
+  size_t size;
+
+  if (output_file != NULL)
+  {
+    size =
+        GNUNET_asprintf (&output_buffer, "%s -> %s [%s]: %llu\n",
+                          GNUNET_i2s (&peer->daemon->id),
+                         subsystem, name, value);
+    if (size != GNUNET_DISK_file_write (output_file, output_buffer, size))
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+    GNUNET_free (output_buffer);
+  }
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "%s -> %s [%s]: %llu\n",
+                GNUNET_i2s (&peer->daemon->id), subsystem, name, value);
+
+  return GNUNET_OK;
+}
+
+/**
+ * Continuation called by "get_stats" function.
+ *
+ * @param cls closure
+ * @param success GNUNET_OK if statistics were
+ *        successfully obtained, GNUNET_SYSERR if not.
+ */
+static void
+core_stats_cont (void *cls, int success);
+
+static void
+core_get_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct NSEPeer *peer = cls;
+  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+  {
+    GNUNET_STATISTICS_destroy(peer->stats, GNUNET_YES);
+  }
+  else
+  {
+    GNUNET_STATISTICS_get(peer->stats, "core", NULL,
+                          GNUNET_TIME_UNIT_FOREVER_REL,
+                          &core_stats_cont, &core_stats_iterator, peer);
+  }
+}
+
+/**
+ * Continuation called by "get_stats" function.
+ *
+ * @param cls closure
+ * @param success GNUNET_OK if statistics were
+ *        successfully obtained, GNUNET_SYSERR if not.
+ */
+static void
+core_stats_cont (void *cls, int success)
+{
+  struct NSEPeer *peer = cls;
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+                                &core_get_stats, peer);
+}
+
 
+/**
+ *
+ */
 static void
 connect_nse_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -256,6 +336,13 @@ connect_nse_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                               current_peer);
       GNUNET_assert (current_peer->nse_handle != NULL);
     }
+    current_peer->stats = GNUNET_STATISTICS_create("profiler", current_peer->daemon->cfg);
+    GNUNET_STATISTICS_get(current_peer->stats, "core", NULL, GNUNET_TIME_UNIT_FOREVER_REL,
+                          &core_stats_cont, &core_stats_iterator, current_peer);
+    GNUNET_STATISTICS_get(current_peer->stats, "transport", NULL, GNUNET_TIME_UNIT_FOREVER_REL,
+                          NULL, &core_stats_iterator, current_peer);
+    GNUNET_STATISTICS_get(current_peer->stats, "nse", NULL, GNUNET_TIME_UNIT_FOREVER_REL,
+                          NULL, &core_stats_iterator, current_peer);
     GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, current_peer);
   }
 }
@@ -536,12 +623,12 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   char *temp_str;
-  unsigned long long temp_wait;
   struct GNUNET_TESTING_Host *hosts;
   char *data_filename;
 
   ok = 1;
-  testing_cfg = GNUNET_CONFIGURATION_create ();
+  //testing_cfg = GNUNET_CONFIGURATION_create ();
+  testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
   GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
@@ -558,7 +645,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (testing_cfg, "nse-profiler",
-                                          "WAIT_TIME", &wait_time))
+                                           "WAIT_TIME", &wait_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Option nse-profiler:wait_time is required!\n");
@@ -600,17 +687,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_free (data_filename);
   }
 
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (testing_cfg, "nse-profiler",
-                                            "skew_clock"))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Setting our clock as skewed...\n");
-    clock_skew =
-        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                  GNUNET_TIME_UNIT_MINUTES.rel_value);
-  }
-
-
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "nse-profiler", "output_file",
                                              &temp_str))