big scheduler refactoring, expect some issues

1 files changed, 9 insertions, 22 deletions

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 3d6afbdc2..092cedfc2 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -48,8 +48,6 @@
 
 static struct GNUNET_FS_TestDaemon *daemons[2];
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static int ok;
 
 static struct GNUNET_TIME_Absolute start_time;
@@ -61,8 +59,7 @@ do_stop (void *cls,
   struct GNUNET_TIME_Relative del;
   char *fancy;
 
-  GNUNET_FS_TEST_daemons_stop (sched,
-                               2,
+  GNUNET_FS_TEST_daemons_stop (2,
                                daemons);
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
     {
@@ -95,8 +92,7 @@ do_download (void *cls,
 
   if (emsg != NULL)
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                   2,
+      GNUNET_FS_TEST_daemons_stop (2,
                                    daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Failed to stop source daemon: %s\n",
@@ -109,8 +105,7 @@ do_download (void *cls,
               "Downloading %llu bytes\n",
               (unsigned long long) FILESIZE);
   start_time = GNUNET_TIME_absolute_get ();
-  GNUNET_FS_TEST_download (sched,
-                           daemons[0],
+  GNUNET_FS_TEST_download (daemons[0],
                            TIMEOUT,
                            1, SEED, uri, 
                            VERBOSE, 
@@ -143,8 +138,7 @@ do_wait (void *cls,
 
   if (NULL == uri)
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                   2,
+      GNUNET_FS_TEST_daemons_stop (2,
                                    daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Timeout during upload attempt, shutting down with error\n");
@@ -154,8 +148,7 @@ do_wait (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Waiting to allow content to migrate\n"); 
   d = GNUNET_FS_uri_dup (uri);
-  (void) GNUNET_SCHEDULER_add_delayed (sched,
-                                       MIGRATION_DELAY,
+  (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY,
                                        &stop_source_peer,
                                        d);
 }
@@ -167,8 +160,7 @@ do_publish (void *cls,
 {
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
     {
-      GNUNET_FS_TEST_daemons_stop (sched,
-                                   2,
+      GNUNET_FS_TEST_daemons_stop (2,
                                    daemons);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Timeout during connect attempt, shutting down with error\n");
@@ -178,8 +170,7 @@ do_publish (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Publishing %llu bytes\n",
               (unsigned long long) FILESIZE);
-  GNUNET_FS_TEST_publish (sched,
-                          daemons[1],
+  GNUNET_FS_TEST_publish (daemons[1],
                           TIMEOUT,
                           1, GNUNET_NO, FILESIZE, SEED, 
                           VERBOSE, 
@@ -201,8 +192,7 @@ do_connect (void *cls,
     }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemons started, will now try to connect them\n");
-  GNUNET_FS_TEST_daemons_connect (sched,
-                                  daemons[0],
+  GNUNET_FS_TEST_daemons_connect (daemons[0],
                                   daemons[1],
                                   TIMEOUT,
                                   &do_publish,
@@ -212,14 +202,11 @@ do_connect (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;
-  GNUNET_FS_TEST_daemons_start (sched,
-                                "test_gnunet_service_fs_migration_data.conf",
+  GNUNET_FS_TEST_daemons_start ("test_gnunet_service_fs_migration_data.conf",
                                 TIMEOUT,
                                 2,
                                 daemons,