bugfixes and redesigning scheduler API

6 files changed, 12 insertions, 53 deletions

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 3a22f9bda..27b1cd58e 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -260,9 +260,6 @@ expired_processor (void *cls,
     {
       expired_kill_task 
         = GNUNET_SCHEDULER_add_delayed (sched,
-                                        GNUNET_NO,
-                                        GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                        GNUNET_SCHEDULER_NO_TASK,
                                         MAX_EXPIRE_DELAY,
                                         &delete_expired,
                                         NULL);
@@ -1209,7 +1206,7 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GNUNET_CONTAINER_bloomfilter_free (filter);
       filter = NULL;
     }
- //  GNUNET_ARM_stop_services (cfg, tc->sched, "statistics", NULL);
+  GNUNET_ARM_stop_services (cfg, tc->sched, "statistics", NULL);
 }
 
 
@@ -1307,28 +1304,22 @@ run (void *cls,
                   _("Failed to initialize bloomfilter.\n"));
       return;
     }
-//  GNUNET_ARM_start_services (cfg, sched, "statistics", NULL);
+  GNUNET_ARM_start_services (cfg, sched, "statistics", NULL);
   plugin = load_plugin ();
   if (NULL == plugin)
     {
       GNUNET_CONTAINER_bloomfilter_free (filter);
       filter = NULL;
-//      GNUNET_ARM_stop_services (cfg, sched, "statistics", NULL);
+      GNUNET_ARM_stop_services (cfg, sched, "statistics", NULL);
       return;
     }
   GNUNET_SERVER_disconnect_notify (server, &cleanup_reservations, NULL);
   GNUNET_SERVER_add_handlers (server, handlers);
   expired_kill_task
-    = GNUNET_SCHEDULER_add_delayed (sched,
-                                    GNUNET_NO,
-                                    GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                    GNUNET_SCHEDULER_NO_TASK,
-                                    GNUNET_TIME_UNIT_ZERO,
-                                    &delete_expired, NULL);
+    = GNUNET_SCHEDULER_add_with_priority (sched,
+                                          GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                          &delete_expired, NULL);
   GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_YES,
-                                GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                GNUNET_SCHEDULER_NO_TASK,
                                 GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleaning_task, NULL);
   
@@ -1350,7 +1341,7 @@ main (int argc, char *const *argv)
   ret = (GNUNET_OK ==
          GNUNET_SERVICE_run (argc,
                              argv,
-                             "datastore", &run, NULL, NULL, NULL)) ? 0 : 1;
+                             "datastore", &run, NULL)) ? 0 : 1;
   return ret;
 }
 
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 2344dafe8..34adf0c7d 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -140,7 +140,6 @@ check_success (void *cls,
         crc->phase = RP_CUT;
     }
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -167,7 +166,6 @@ remove_next(void *cls,
 #endif
   GNUNET_assert (GNUNET_OK == success);
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -214,18 +212,15 @@ delete_value (void *cls,
         {
           crc->phase = RP_REPORT;
           GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                             GNUNET_NO,
                                              &run_continuation,
                                              crc,
                                              GNUNET_SCHEDULER_REASON_PREREQ_DONE);
           return;     
         }
-      GNUNET_SCHEDULER_add_after (crc->sched,
-                                  GNUNET_NO,
-                                  GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                  GNUNET_SCHEDULER_NO_TASK,
-                                  &do_delete,
-                                  crc);
+      GNUNET_SCHEDULER_add_with_priority (crc->sched,
+                                          GNUNET_SCHEDULER_PRIORITY_HIGH,
+                                          &do_delete,
+                                          crc);
       return;
     }
   stored_ops++;
@@ -303,7 +298,6 @@ run_continuation (void *cls,
       crc->phase = RP_PUT;
       crc->j = 0;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         GNUNET_NO,
                                          &run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -335,7 +329,6 @@ run (void *cls,
   crc->cfg = cfg;
   crc->phase = RP_PUT;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -364,7 +357,6 @@ check ()
                                  "-L", "DEBUG",
 #endif
                                  "-c", "test_datastore_api_data.conf", NULL);
-  sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "perf-datastore-api", "nohelp",
                       options, &run, NULL);
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index b7bc9db31..a23569875 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -168,8 +168,6 @@ iterateDummy (void *cls,
             crc->phase = RP_PUT;
         }
       GNUNET_SCHEDULER_add_after (crc->sched,
-                                  GNUNET_NO,
-                                  GNUNET_SCHEDULER_PRIORITY_KEEP,
                                   GNUNET_SCHEDULER_NO_TASK,
                                   &test, crc);
       return GNUNET_OK;
@@ -254,8 +252,6 @@ test (void *cls,
       crc->i++;
       crc->phase = RP_LP_GET;
       GNUNET_SCHEDULER_add_after (crc->sched,
-                                  GNUNET_NO,
-                                  GNUNET_SCHEDULER_PRIORITY_KEEP,
                                   GNUNET_SCHEDULER_NO_TASK,
                                   &test, crc);
       break;
@@ -301,11 +297,8 @@ test (void *cls,
       break;
     case RP_DONE:
       crc->api->drop (crc->api->cls);
-      GNUNET_SCHEDULER_add_delayed (crc->sched,
-                                    GNUNET_YES,
+      GNUNET_SCHEDULER_add_with_priority (crc->sched,
                                     GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                    GNUNET_SCHEDULER_NO_TASK,
-                                    GNUNET_TIME_UNIT_ZERO,
                                     &cleaning_task, crc);
       break;
     }
@@ -364,8 +357,6 @@ run (void *cls,
   crc->cfg = c;
   crc->phase = RP_PUT;
   GNUNET_SCHEDULER_add_after (s,
-                              GNUNET_YES,
-                              GNUNET_SCHEDULER_PRIORITY_KEEP,
                               GNUNET_SCHEDULER_NO_TASK,
                               &test, crc);
 }
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index e673bafa4..1607ba5e0 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -663,7 +663,6 @@ sqlite_next_request (void *next_cls,
   if (GNUNET_YES == end_it)
     nc->end_it = GNUNET_YES;
   GNUNET_SCHEDULER_add_continuation (nc->plugin->env->sched,
-                                     GNUNET_NO,
                                      &sqlite_next_request_cont,
                                      nc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 605cb042d..5d4443cbe 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -145,7 +145,6 @@ check_success (void *cls,
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -164,7 +163,6 @@ get_reserved (void *cls,
   GNUNET_assert (0 < success);
   crc->rid = success;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -193,7 +191,6 @@ check_value (void *cls,
           crc->i = ITERATIONS;
         }
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         GNUNET_NO,
                                          &run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -226,7 +223,6 @@ delete_value (void *cls,
     {
       crc->phase = RP_DO_DEL;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         GNUNET_NO,
                                          &run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -259,7 +255,6 @@ check_nothing (void *cls,
       crc->phase = RP_RESERVE;    
     }
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -284,7 +279,6 @@ check_multiple (void *cls,
       GNUNET_assert (crc->phase == RP_GET_MULTIPLE_DONE);
       crc->phase = RP_UPDATE;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         GNUNET_NO,
                                          &run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -315,7 +309,6 @@ check_update (void *cls,
       GNUNET_assert (crc->phase == RP_UPDATE_DONE);
       crc->phase = RP_DONE;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         GNUNET_NO,
                                          &run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -542,7 +535,6 @@ run (void *cls,
   now = GNUNET_TIME_absolute_get ();
   datastore = GNUNET_DATASTORE_connect (cfg, sched);
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -572,7 +564,6 @@ check ()
                                  "-L", "DEBUG",
 #endif
                                  "-c", "test_datastore_api_data.conf", NULL);
-  sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "test-datastore-api", "nohelp",
                       options, &run, NULL);
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 48daebb1d..cad789a6f 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -133,7 +133,6 @@ check_success (void *cls,
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -171,7 +170,6 @@ check_value (void *cls,
       if (0 == crc->i)
         crc->phase = RP_DONE;
       GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                         GNUNET_NO,
                                          &run_continuation,
                                          crc,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -206,7 +204,6 @@ check_nothing (void *cls,
   if (0 == --crc->i)
     crc->phase = RP_DONE;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -310,7 +307,6 @@ run (void *cls,
   now = GNUNET_TIME_absolute_get ();
   datastore = GNUNET_DATASTORE_connect (cfg, sched);
   GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                     GNUNET_NO,
                                      &run_continuation,
                                      crc,
                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
@@ -340,7 +336,6 @@ check ()
                                  "-L", "DEBUG",
 #endif
                                  "-c", "test_datastore_api_data.conf", NULL);
-  sleep (1);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "test-datastore-api", "nohelp",
                       options, &run, NULL);