Do not crash if key is NULL.

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

diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c
index a7ef7786dc46769066c8b9edc266be883f381999..56a3084cc429e58a134fa1756f4838ed52a68878 100644 (file)
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -20,7 +20,7 @@
 
 /**
  * @file fs/gnunet-fs-profiler.c
- * @brief tool to benchmark/profile file-sharing 
+ * @brief tool to benchmark/profile file-sharing
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -42,23 +42,122 @@ static char *host_filename;
  */
 static unsigned int num_peers;
 
+/**
+ * After how long do we abort the test?
+ */
+static struct GNUNET_TIME_Relative timeout;
 
 /**
- * The testbed has been started, now begin the experiment.
+ * Handle to the task run during termination.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier terminate_taskid;
+
+
+/**
+ * Function called after we've collected the statistics.
  *
- * @param cls configuration handle
- * @param tc scheduler context
- */ 
+ * @param cls NULL
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ *          operation has executed successfully.
+ */
 static void
-master_task (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+              struct GNUNET_TESTBED_Operation *op,
+              const char *emsg)
 {
-  // const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
+  if (NULL != emsg)
+    fprintf (stderr,
+            "Error collecting statistics: %s\n",
+            emsg);
   GNUNET_SCHEDULER_shutdown ();
 }
 
 
+/**
+ * Callback function to process statistic values from all peers.
+ * Prints them out.
+ *
+ * @param cls closure
+ * @param peer the peer the statistic belong to
+ * @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
+process_stats (void *cls,
+              const struct GNUNET_TESTBED_Peer *peer,
+              const char *subsystem,
+              const char *name,
+              uint64_t value,
+              int is_persistent)
+{
+  fprintf (stdout,
+          "%p-%s: %s = %llu\n",
+          peer,
+          subsystem,
+          name,
+          (unsigned long long) value);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Task run on timeout to terminate.  Triggers printing out
+ * all statistics.
+ *
+ * @param cls NULL
+ * @param tc unused
+ */
+static void
+terminate_task (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  terminate_taskid = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_TESTBED_get_statistics (0, NULL,
+                                 NULL, NULL,
+                                &process_stats,
+                                &shutdown_task,
+                                NULL);
+}
+
+
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param h the run handle
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
+ */
+static void
+test_master (void *cls,
+             struct GNUNET_TESTBED_RunHandle *h,
+             unsigned int num_peers,
+             struct GNUNET_TESTBED_Peer **peers,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
+{
+  // const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  // FIXME: enable clients to signal 'completion' before timeout;
+  // in that case, run the 'terminate_task' "immediately"
+
+  if (0 != timeout.rel_value_us)
+    terminate_taskid = GNUNET_SCHEDULER_add_delayed (timeout,
+                                                    &terminate_task, NULL);
+  else
+    terminate_taskid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                    &terminate_task,
+                                                    NULL);
+}
+
+
 /**
  * Main function that will be run by the scheduler.
  *
@@ -75,7 +174,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                      cfg,
                      num_peers,
                      0, NULL, NULL,
-                     &master_task, (void *) cfg);
+                     &test_master, (void *) cfg);
 }
 
 
@@ -93,10 +192,12 @@ main (int argc, char *const *argv)
     {'n', "num-peers", "COUNT",
      gettext_noop ("run the experiment with COUNT peers"),
      1, &GNUNET_GETOPT_set_uint, &num_peers},
-    {'t', "testbed", "HOSTFILE",
+    {'H', "hosts", "HOSTFILE",
      gettext_noop ("specifies name of a file with the HOSTS the testbed should use"),
      1, &GNUNET_GETOPT_set_string, &host_filename},
-
+    {'t', "timeout", "DELAY",
+     gettext_noop ("automatically terminate experiment after DELAY"),
+     1, &GNUNET_GETOPT_set_relative_time, &timeout},
     GNUNET_GETOPT_OPTION_END
   };
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))