big scheduler refactoring, expect some issues

1 files changed, 7 insertions, 18 deletions

diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c
index d755a9582..4def3fe6a 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/fs/test_fs_search_persistence.c
@@ -61,8 +61,6 @@ static struct PeerContext p1;
 
 static struct GNUNET_TIME_Absolute start;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static struct GNUNET_FS_Handle *fs;
 
 static struct GNUNET_FS_SearchContext *search;
@@ -100,8 +98,7 @@ restart_fs_task (void *cls,
                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_FS_stop (fs);
-  fs = GNUNET_FS_start (sched,
-                        cfg,
+  fs = GNUNET_FS_start (cfg,
                         "test-fs-search-persistence",
                         &progress_cb,
                         NULL,
@@ -129,8 +126,7 @@ consider_restart (int ev)
     if (prev[i] == ev)
       return;
   prev[off++] = ev;
-  GNUNET_SCHEDULER_add_with_priority (sched,
-                                      GNUNET_SCHEDULER_PRIORITY_URGENT,
+  GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_URGENT,
                                       &restart_fs_task,
                                       NULL);
 }
@@ -181,8 +177,7 @@ progress_cb (void *cls,
 #if VERBOSE
       printf ("Search complete.\n");
 #endif
-      GNUNET_SCHEDULER_add_continuation (sched,
-                                         &abort_search_task,
+      GNUNET_SCHEDULER_add_continuation (&abort_search_task,
                                          NULL,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
@@ -191,8 +186,7 @@ progress_cb (void *cls,
                "Error publishing file: %s\n",
                event->value.publish.specifics.error.message);
       GNUNET_break (0);
-      GNUNET_SCHEDULER_add_continuation (sched,
-                                         &abort_publish_task,
+      GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
                                          NULL,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
@@ -200,8 +194,7 @@ progress_cb (void *cls,
       fprintf (stderr,
                "Error searching file: %s\n",
                event->value.search.specifics.error.message);
-      GNUNET_SCHEDULER_add_continuation (sched,
-                                         &abort_search_task,
+      GNUNET_SCHEDULER_add_continuation (&abort_search_task,
                                          NULL,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
@@ -241,8 +234,7 @@ progress_cb (void *cls,
       break;
     case GNUNET_FS_STATUS_SEARCH_STOPPED:
       GNUNET_assert (search == event->value.search.sc);
-      GNUNET_SCHEDULER_add_continuation (sched,
-                                         &abort_publish_task,
+      GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
                                          NULL,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       search = NULL;
@@ -292,7 +284,6 @@ stop_arm (struct PeerContext *p)
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
@@ -307,11 +298,9 @@ run (void *cls,
   struct GNUNET_FS_FileInformation *fi;
   size_t i;
 
-  sched = s;
   cfg = c;
   setup_peer (&p1, "test_fs_search_data.conf");
-  fs = GNUNET_FS_start (sched,
-                        cfg,
+  fs = GNUNET_FS_start (cfg,
                         "test-fs-search-persistence",
                         &progress_cb,
                         NULL,