big scheduler refactoring, expect some issues

1 files changed, 8 insertions, 14 deletions

diff --git a/src/testing/test_testing_topology_churn.c b/src/testing/test_testing_topology_churn.c
index a4b80e4a4..0e3647015 100644
--- a/src/testing/test_testing_topology_churn.c
+++ b/src/testing/test_testing_topology_churn.c
@@ -51,8 +51,6 @@ static unsigned long long peers_left;
 
 static struct GNUNET_TESTING_PeerGroup *pg;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 const struct GNUNET_CONFIGURATION_Handle *main_cfg;
 
 GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -104,7 +102,7 @@ finish_testing ()
   GNUNET_assert (pg != NULL);
 
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel(sched, die_task);
+    GNUNET_SCHEDULER_cancel(die_task);
 
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -161,13 +159,13 @@ void churn_callback(void *cls,
   if (emsg == NULL)
     {
       GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Successfully churned peers!\n", emsg);
-      GNUNET_SCHEDULER_add_now(sched, churn_ctx.next_task, NULL);
+      GNUNET_SCHEDULER_add_now(churn_ctx.next_task, NULL);
     }
   else
     {
       GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to churn peers with error `%s'\n", emsg);
-      GNUNET_SCHEDULER_cancel(sched, die_task);
-      die_task = GNUNET_SCHEDULER_add_now(sched, &end_badly, NULL);
+      GNUNET_SCHEDULER_cancel(die_task);
+      die_task = GNUNET_SCHEDULER_add_now(&end_badly, NULL);
     }
 }
 
@@ -225,11 +223,10 @@ peers_started_callback (void *cls,
                   "All %d daemons started, now testing churn!\n",
                   num_peers);
 #endif
-      GNUNET_SCHEDULER_cancel (sched, die_task);
+      GNUNET_SCHEDULER_cancel (die_task);
       /* Set up task in case topology creation doesn't finish
        * within a reasonable amount of time */
-      die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                               GNUNET_TIME_relative_multiply
+      die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                                (GNUNET_TIME_UNIT_MINUTES, 5),
                                                &end_badly, "from peers_started_callback");
       churn_peers_off ();
@@ -240,11 +237,9 @@ peers_started_callback (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  sched = s;
   ok = 1;
 
 #if VERBOSE
@@ -278,12 +273,11 @@ run (void *cls,
 
 
   /* Set up a task to end testing if peer start fails */
-  die_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                           GNUNET_TIME_relative_multiply
+  die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                            (GNUNET_TIME_UNIT_MINUTES, 5),
                                            &end_badly, "didn't start all daemons in reasonable amount of time!!!");
 
-  pg = GNUNET_TESTING_daemons_start (sched, cfg,
+  pg = GNUNET_TESTING_daemons_start (cfg,
                                      peers_left, TIMEOUT, NULL, NULL, &peers_started_callback, NULL,
                                      NULL, NULL, NULL);