big scheduler refactoring, expect some issues

10 files changed, 50 insertions, 124 deletions

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 6c817a840..f9b3db81b 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -181,10 +181,6 @@ struct GNUNET_DATASTORE_Handle
    */
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-  /**
-   * Our scheduler.
-   */
-  struct GNUNET_SCHEDULER_Handle *sched;
 
   /**
    * Current connection to the datastore service.
@@ -247,30 +243,24 @@ struct GNUNET_DATASTORE_Handle
  * Connect to the datastore service.
  *
  * @param cfg configuration to use
- * @param sched scheduler to use
  * @return handle to use to access the service
  */
 struct GNUNET_DATASTORE_Handle *
 GNUNET_DATASTORE_connect (const struct
                           GNUNET_CONFIGURATION_Handle
-                          *cfg,
-                          struct
-                          GNUNET_SCHEDULER_Handle
-                          *sched)
+                          *cfg)
 {
   struct GNUNET_CLIENT_Connection *c;
   struct GNUNET_DATASTORE_Handle *h;
   
-  c = GNUNET_CLIENT_connect (sched, "datastore", cfg);
+  c = GNUNET_CLIENT_connect ("datastore", cfg);
   if (c == NULL)
     return NULL; /* oops */
   h = GNUNET_malloc (sizeof(struct GNUNET_DATASTORE_Handle) + 
                      GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
   h->client = c;
   h->cfg = cfg;
-  h->sched = sched;
-  h->stats = GNUNET_STATISTICS_create (sched,
-                                       "datastore-api", 
+  h->stats = GNUNET_STATISTICS_create ("datastore-api",
                                        cfg);
   return h;
 }
@@ -327,8 +317,7 @@ void GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
     }
   if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (h->sched,
-                               h->reconnect_task);
+      GNUNET_SCHEDULER_cancel (h->reconnect_task);
       h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
     }
   while (NULL != (qe = h->queue_head))
@@ -338,7 +327,7 @@ void GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
     }
   if (GNUNET_YES == drop) 
     {
-      h->client = GNUNET_CLIENT_connect (h->sched, "datastore", h->cfg);
+      h->client = GNUNET_CLIENT_connect ("datastore", h->cfg);
       if (h->client != NULL)
         {
           if (NULL != 
@@ -459,8 +448,7 @@ make_queue_entry (struct GNUNET_DATASTORE_Handle *h,
       response_proc (ret, NULL);
       return NULL;
     }
-  ret->task = GNUNET_SCHEDULER_add_delayed (h->sched,
-                                            timeout,
+  ret->task = GNUNET_SCHEDULER_add_delayed (timeout,
                                             &timeout_queue_entry,
                                             ret);
   pos = ret->next;
@@ -507,7 +495,7 @@ try_reconnect (void *cls,
   if (h->retry_time.rel_value > GNUNET_CONSTANTS_SERVICE_TIMEOUT.rel_value)
     h->retry_time = GNUNET_CONSTANTS_SERVICE_TIMEOUT;
   h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
-  h->client = GNUNET_CLIENT_connect (h->sched, "datastore", h->cfg);
+  h->client = GNUNET_CLIENT_connect ("datastore", h->cfg);
   if (h->client == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -551,8 +539,7 @@ do_disconnect (struct GNUNET_DATASTORE_Handle *h)
 #endif
   GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
   h->client = NULL;
-  h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->sched,
-                                                    h->retry_time,
+  h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->retry_time,
                                                     &try_reconnect,
                                                     h);      
 }
@@ -601,8 +588,7 @@ transmit_request (void *cls,
 #endif
   memcpy (buf, &qe[1], msize);
   qe->was_transmitted = GNUNET_YES;
-  GNUNET_SCHEDULER_cancel (h->sched,
-                           qe->task);
+  GNUNET_SCHEDULER_cancel (qe->task);
   qe->task = GNUNET_SCHEDULER_NO_TASK;
   h->in_receive = GNUNET_YES;
   GNUNET_CLIENT_receive (h->client,
@@ -698,8 +684,7 @@ free_queue_entry (struct GNUNET_DATASTORE_QueueEntry *qe)
                                qe);
   if (qe->task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (h->sched,
-                               qe->task);
+      GNUNET_SCHEDULER_cancel (qe->task);
       qe->task = GNUNET_SCHEDULER_NO_TASK;
     }
   h->queue_size--;
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 6c064743e..09df51d9b 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -179,10 +179,6 @@ static GNUNET_SCHEDULER_TaskIdentifier expired_kill_task;
  */
 const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-/**
- * Our scheduler.
- */
-struct GNUNET_SCHEDULER_Handle *sched; 
 
 /**
  * Handle for reporting statistics.
@@ -343,8 +339,7 @@ expired_processor (void *cls,
   if (key == NULL) 
     {
       expired_kill_task 
-        = GNUNET_SCHEDULER_add_delayed (sched,
-                                        MAX_EXPIRE_DELAY,
+        = GNUNET_SCHEDULER_add_delayed (MAX_EXPIRE_DELAY,
                                         &delete_expired,
                                         NULL);
       return GNUNET_SYSERR;
@@ -1527,7 +1522,6 @@ load_plugin ()
     }
   ret = GNUNET_malloc (sizeof(struct DatastorePlugin));
   ret->env.cfg = cfg;
-  ret->env.sched = sched;  
   ret->env.duc = &disk_utilization_change_cb;
   ret->env.cls = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -1625,12 +1619,10 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     }
   if (expired_kill_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (sched,
-                               expired_kill_task);
+      GNUNET_SCHEDULER_cancel (expired_kill_task);
       expired_kill_task = GNUNET_SCHEDULER_NO_TASK;
     }
-  GNUNET_SCHEDULER_add_continuation (sched,
-                                     &unload_task,
+  GNUNET_SCHEDULER_add_continuation (&unload_task,
                                      NULL,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -1686,13 +1678,11 @@ cleanup_reservations (void *cls,
  * Process datastore requests.
  *
  * @param cls closure
- * @param s scheduler to use
  * @param server the initialized server
  * @param c configuration to use
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
@@ -1717,7 +1707,6 @@ run (void *cls,
   char *fn;
   unsigned int bf_size;
 
-  sched = s;
   cfg = c;
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg,
@@ -1729,7 +1718,7 @@ run (void *cls,
                   "DATASTORE");
       return;
     }
-  stats = GNUNET_STATISTICS_create (sched, "datastore", cfg);
+  stats = GNUNET_STATISTICS_create ("datastore", cfg);
   GNUNET_STATISTICS_set (stats,
                          gettext_noop ("# quota"),
                          quota,
@@ -1790,11 +1779,9 @@ run (void *cls,
   GNUNET_SERVER_disconnect_notify (server, &cleanup_reservations, NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
   expired_kill_task
-    = GNUNET_SCHEDULER_add_with_priority (sched,
-                                          GNUNET_SCHEDULER_PRIORITY_IDLE,
+    = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
                                           &delete_expired, NULL);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleaning_task, NULL);
 }
 
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 8dd7e6680..1f7c828e0 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -93,7 +93,6 @@ enum RunPhase
 
 struct CpsRunContext
 {
-  struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   enum RunPhase phase;
   int j;
@@ -140,8 +139,7 @@ check_success (void *cls,
       else
         crc->phase = RP_CUT;
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -166,8 +164,7 @@ remove_next(void *cls,
   fprintf (stderr, "D");
 #endif
   GNUNET_assert (GNUNET_OK == success);
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -212,14 +209,12 @@ delete_value (void *cls,
       if (stored_bytes < MAX_SIZE)
         {
           crc->phase = RP_REPORT;
-          GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                             &run_continuation,
+          GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                              crc,
                                              GNUNET_SCHEDULER_REASON_PREREQ_DONE);
           return;     
         }
-      GNUNET_SCHEDULER_add_with_priority (crc->sched,
-                                          GNUNET_SCHEDULER_PRIORITY_HIGH,
+      GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
                                           &do_delete,
                                           crc);
       return;
@@ -298,8 +293,7 @@ run_continuation (void *cls,
                1000 * stored_ops / (1 + GNUNET_TIME_absolute_get_duration(start_time).rel_value));
       crc->phase = RP_PUT;
       crc->j = 0;
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;
@@ -330,8 +324,7 @@ run_tests (void *cls,
       GNUNET_free (crc);
       return;
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -339,7 +332,6 @@ run_tests (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -347,10 +339,9 @@ run (void *cls,
   struct CpsRunContext *crc;
   static GNUNET_HashCode zkey;
 
-  datastore = GNUNET_DATASTORE_connect (cfg, sched);
+  datastore = GNUNET_DATASTORE_connect (cfg);
   start_time = GNUNET_TIME_absolute_get ();
   crc = GNUNET_malloc(sizeof(struct CpsRunContext));
-  crc->sched = sched;
   crc->cfg = cfg;
   crc->phase = RP_PUT;
   if (NULL ==
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index d870c0da3..b60bb07c6 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -72,7 +72,6 @@ struct CpsRunContext
   unsigned int i;
   struct GNUNET_TIME_Absolute start;
   struct GNUNET_TIME_Absolute end;
-  struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_DATASTORE_PluginFunctions * api;
   const char *msg;
@@ -183,8 +182,7 @@ iterateDummy (void *cls,
           else
             crc->phase = RP_PUT;
         }
-      GNUNET_SCHEDULER_add_after (crc->sched,
-                                  GNUNET_SCHEDULER_NO_TASK,
+      GNUNET_SCHEDULER_add_after (GNUNET_SCHEDULER_NO_TASK,
                                   &test, crc);
       return GNUNET_OK;
     }
@@ -267,8 +265,7 @@ test (void *cls,
               (unsigned int) PUT_10);
       crc->i++;
       crc->phase = RP_LP_GET;
-      GNUNET_SCHEDULER_add_after (crc->sched,
-                                  GNUNET_SCHEDULER_NO_TASK,
+      GNUNET_SCHEDULER_add_after (GNUNET_SCHEDULER_NO_TASK,
                                   &test, crc);
       break;
     case RP_LP_GET:
@@ -313,8 +310,7 @@ test (void *cls,
       break;
     case RP_DONE:
       crc->api->drop (crc->api->cls);
-      GNUNET_SCHEDULER_add_with_priority (crc->sched,
-                                    GNUNET_SCHEDULER_PRIORITY_IDLE,
+      GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
                                     &cleaning_task, crc);
       break;
     }
@@ -325,8 +321,7 @@ test (void *cls,
  * Load the datastore plugin.
  */
 static struct GNUNET_DATASTORE_PluginFunctions *
-load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg,
-             struct GNUNET_SCHEDULER_Handle *sched)
+load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static struct GNUNET_DATASTORE_PluginEnvironment env;
   struct GNUNET_DATASTORE_PluginFunctions * ret; 
@@ -344,7 +339,6 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg,
       return NULL;
     }
   env.cfg = cfg;
-  env.sched = sched;  
   env.duc = &disk_utilization_change_cb;
   env.cls = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -365,7 +359,6 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
@@ -373,7 +366,7 @@ run (void *cls,
   struct GNUNET_DATASTORE_PluginFunctions *api;
   struct CpsRunContext *crc;
 
-  api = load_plugin (c, s);
+  api = load_plugin (c);
   if (api == NULL)
     {
       fprintf (stderr, 
@@ -382,11 +375,9 @@ run (void *cls,
     }
   crc = GNUNET_malloc(sizeof(struct CpsRunContext));
   crc->api = api;
-  crc->sched = s;
   crc->cfg = c;
   crc->phase = RP_PUT;
-  GNUNET_SCHEDULER_add_now (crc->sched,
-                            &test, crc);
+  GNUNET_SCHEDULER_add_now (&test, crc);
 }
 
 
diff --git a/src/datastore/plugin_datastore.h b/src/datastore/plugin_datastore.h
index fa08501cc..cb8686c62 100644
--- a/src/datastore/plugin_datastore.h
+++ b/src/datastore/plugin_datastore.h
@@ -64,10 +64,6 @@ struct GNUNET_DATASTORE_PluginEnvironment
    */
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-  /**
-   * Scheduler to use.
-   */
-  struct GNUNET_SCHEDULER_Handle *sched;
 
   /**
    * Function to call on disk utilization change.
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index 0aefbb75d..ae6a98c6e 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -1258,8 +1258,7 @@ mysql_plugin_next_request (void *next_cls,
   if (GNUNET_YES == end_it)
     nrc->end_it = GNUNET_YES;
   nrc->plugin->next_task_nc = nrc;
-  nrc->plugin->next_task = GNUNET_SCHEDULER_add_now (nrc->plugin->env->sched,
-                                                     &mysql_next_request_cont,
+  nrc->plugin->next_task = GNUNET_SCHEDULER_add_now (&mysql_next_request_cont,
                                                      nrc);
 }  
 
@@ -1968,8 +1967,7 @@ libgnunet_plugin_datastore_mysql_done (void *cls)
   iclose (plugin);
   if (plugin->next_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (plugin->env->sched,
-                               plugin->next_task);
+      GNUNET_SCHEDULER_cancel (plugin->next_task);
       plugin->next_task = GNUNET_SCHEDULER_NO_TASK;
       plugin->next_task_nc->prep (plugin->next_task_nc->prep_cls, NULL);
       GNUNET_free (plugin->next_task_nc);
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 44a01fcb8..9886b1c8b 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -847,8 +847,7 @@ postgres_plugin_next_request (void *next_cls,
   if (GNUNET_YES == end_it)
     nrc->end_it = GNUNET_YES;
   nrc->plugin->next_task_nc = nrc;
-  nrc->plugin->next_task = GNUNET_SCHEDULER_add_now (nrc->plugin->env->sched,
-                                                     &postgres_next_request_cont,
+  nrc->plugin->next_task = GNUNET_SCHEDULER_add_now (&postgres_next_request_cont,
                                                      nrc);
 }
 
@@ -1358,8 +1357,7 @@ libgnunet_plugin_datastore_postgres_done (void *cls)
   
   if (plugin->next_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (plugin->env->sched,
-                               plugin->next_task);
+      GNUNET_SCHEDULER_cancel (plugin->next_task);
       plugin->next_task = GNUNET_SCHEDULER_NO_TASK;
       GNUNET_free (plugin->next_task_nc);
       plugin->next_task_nc = NULL;
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 01df7b670..b9edb4e57 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -623,8 +623,7 @@ sqlite_next_request (void *next_cls,
   if (GNUNET_YES == end_it)
     nc->end_it = GNUNET_YES;
   nc->plugin->next_task_nc = nc;
-  nc->plugin->next_task = GNUNET_SCHEDULER_add_now (nc->plugin->env->sched,
-                                                    &sqlite_next_request_cont,
+  nc->plugin->next_task = GNUNET_SCHEDULER_add_now (&sqlite_next_request_cont,
                                                     nc);
 }
 
@@ -1598,8 +1597,7 @@ libgnunet_plugin_datastore_sqlite_done (void *cls)
 
   if (plugin->next_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (plugin->env->sched,
-                               plugin->next_task);
+      GNUNET_SCHEDULER_cancel (plugin->next_task);
       plugin->next_task = GNUNET_SCHEDULER_NO_TASK;
       plugin->next_task_nc->prep (plugin->next_task_nc->prep_cls, NULL);
       GNUNET_free (plugin->next_task_nc);
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 3b7202005..06abc0c0f 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -125,7 +125,6 @@ struct CpsRunContext
   GNUNET_HashCode key;
   int i;
   int rid;
-  struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   void *data;
   size_t size;
@@ -150,13 +149,12 @@ check_success (void *cls,
       ok = 42;
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "%s\n", msg);
-      GNUNET_SCHEDULER_shutdown (crc->sched);
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -173,8 +171,7 @@ get_reserved (void *cls,
                 "%s\n", msg);
   GNUNET_assert (0 < success);
   crc->rid = success;
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -201,8 +198,7 @@ check_value (void *cls,
           crc->phase = RP_DEL;
           crc->i = ITERATIONS;
         }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -243,8 +239,7 @@ delete_value (void *cls,
         {
           crc->phase = RP_DO_DEL;
         }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -275,8 +270,7 @@ check_nothing (void *cls,
     {
       crc->phase = RP_RESERVE;    
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -309,8 +303,7 @@ check_multiple (void *cls,
         {
           crc->phase = RP_UPDATE;
         }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -364,8 +357,7 @@ check_update (void *cls,
         {
           crc->phase = RP_DONE;
         }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -597,8 +589,7 @@ run_tests (void *cls,
       GNUNET_free (crc);
       return;
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -606,7 +597,6 @@ run_tests (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -615,11 +605,10 @@ run (void *cls,
   static GNUNET_HashCode zkey;
 
   crc = GNUNET_malloc(sizeof(struct CpsRunContext));
-  crc->sched = sched;
   crc->cfg = cfg;
   crc->phase = RP_PUT;
   now = GNUNET_TIME_absolute_get ();
-  datastore = GNUNET_DATASTORE_connect (cfg, sched);
+  datastore = GNUNET_DATASTORE_connect (cfg);
   if (NULL ==
       GNUNET_DATASTORE_put (datastore, 0,
                             &zkey, 4, "TEST",
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 81450d12a..d17d8fbc8 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -109,7 +109,6 @@ struct CpsRunContext
   GNUNET_HashCode key;
   int i;
   int found;
-  struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   void *data;
   enum RunPhase phase;
@@ -133,8 +132,7 @@ check_success (void *cls,
   GNUNET_assert (GNUNET_OK == success);
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -170,8 +168,7 @@ check_value (void *cls,
         }
       if (0 == crc->i)
         crc->phase = RP_DONE;
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -204,8 +201,7 @@ check_nothing (void *cls,
   GNUNET_assert (key == NULL);
   if (0 == --crc->i)
     crc->phase = RP_DONE;
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -307,8 +303,7 @@ run_tests (void *cls,
       GNUNET_free (crc);
       return;
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -316,7 +311,6 @@ run_tests (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -325,11 +319,10 @@ run (void *cls,
   static GNUNET_HashCode zkey;
 
   crc = GNUNET_malloc(sizeof(struct CpsRunContext));
-  crc->sched = sched;
   crc->cfg = cfg;
   crc->phase = RP_PUT;
   now = GNUNET_TIME_absolute_get ();
-  datastore = GNUNET_DATASTORE_connect (cfg, sched);
+  datastore = GNUNET_DATASTORE_connect (cfg);
   if (NULL ==
       GNUNET_DATASTORE_put (datastore, 0,
                             &zkey, 4, "TEST",