big scheduler refactoring, expect some issues

1 files changed, 5 insertions, 14 deletions

diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index b1260456b..52b2b270e 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -60,8 +60,6 @@ static struct PeerContext p1;
 
 static struct GNUNET_TIME_Absolute start;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static struct GNUNET_FS_Handle *fs;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -101,8 +99,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-publish-persistence",
                         &progress_cb,
                         NULL,
@@ -128,8 +125,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);
 }
@@ -151,8 +147,7 @@ progress_cb (void *cls,
               (unsigned long long) (FILESIZE * 1000 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024));
       if (0 == strcmp ("publish-context-dir", 
                        event->value.publish.cctx))      
-        GNUNET_SCHEDULER_add_continuation (sched,
-                                           &abort_publish_task,
+        GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
                                            NULL,
                                            GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
@@ -187,8 +182,7 @@ progress_cb (void *cls,
       err = 1;
       if (0 == strcmp ("publish-context-dir", 
                        event->value.publish.cctx))              
-        GNUNET_SCHEDULER_add_continuation (sched,
-                                           &abort_publish_task,
+        GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
                                            NULL,
                                            GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
@@ -273,7 +267,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)
@@ -290,11 +283,9 @@ run (void *cls,
   struct GNUNET_FS_FileInformation *fidir;
   size_t i;
 
-  sched = s;
   cfg = c;
   setup_peer (&p1, "test_fs_publish_data.conf");
-  fs = GNUNET_FS_start (sched,
-                        cfg,
+  fs = GNUNET_FS_start (cfg,
                         "test-fs-publish-persistence",
                         &progress_cb,
                         NULL,