adding single location for no_forcestart configuration list

[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 4d4d3405109d6c64a8d1b777b02537f6af12e638..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"
@@ -117,6 +117,7 @@ terminate_task (void *cls,
 {
   terminate_taskid = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_TESTBED_get_statistics (0, NULL,
+                                 NULL, NULL,
                                 &process_stats,
                                 &shutdown_task,
                                 NULL);
@@ -124,24 +125,34 @@ terminate_task (void *cls,
 
 
 /**
- * The testbed has been started, now begin the experiment.
+ * Signature of a main function for a testcase.
  *
- * @param cls configuration handle
- * @param tc scheduler context
- */ 
+ * @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
-master_task (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+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)
+  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_taskid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                                     &terminate_task,
                                                     NULL);
 }
@@ -163,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);
 }