small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()

8 files changed, 36 insertions, 49 deletions

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index cca67f6bc..832829e24 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -278,11 +278,9 @@ GNUNET_DATASTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
  * Task used by 'transmit_drop' to disconnect the datastore.
  *
  * @param cls the datastore handle
- * @param tc scheduler context
  */
 static void
-disconnect_after_drop (void *cls,
-                       const struct GNUNET_SCHEDULER_TaskContext *tc)
+disconnect_after_drop (void *cls)
 {
   struct GNUNET_DATASTORE_Handle *h = cls;
 
@@ -383,10 +381,9 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
  * A request has timed out (before being transmitted to the service).
  *
  * @param cls the `struct GNUNET_DATASTORE_QueueEntry`
- * @param tc scheduler context
  */
 static void
-timeout_queue_entry (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_queue_entry (void *cls)
 {
   struct GNUNET_DATASTORE_QueueEntry *qe = cls;
   struct GNUNET_DATASTORE_Handle *h = qe->h;
@@ -520,10 +517,9 @@ process_queue (struct GNUNET_DATASTORE_Handle *h);
  * Try reconnecting to the datastore service.
  *
  * @param cls the `struct GNUNET_DATASTORE_Handle`
- * @param tc scheduler context
  */
 static void
-try_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+try_reconnect (void *cls)
 {
   struct GNUNET_DATASTORE_Handle *h = cls;
 
diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c
index 93c23c3fc..186889e4c 100644
--- a/src/datastore/gnunet-datastore.c
+++ b/src/datastore/gnunet-datastore.c
@@ -70,8 +70,7 @@ static struct GNUNET_DATASTORE_QueueEntry *qe;
 
 
 static void
-do_shutdown (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   if (NULL != qe)
     GNUNET_DATASTORE_cancel (qe);
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 4979f4482..fdccd925e 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -303,11 +303,9 @@ static struct GNUNET_SERVER_Handle *server;
  * content quickly.
  *
  * @param cls not used
- * @param tc task context
  */
 static void
-delete_expired (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc);
+delete_expired (void *cls);
 
 
 /**
@@ -388,10 +386,9 @@ expired_processor (void *cls,
  * content quickly.
  *
  * @param cls not used
- * @param tc task context
  */
 static void
-delete_expired (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+delete_expired (void *cls)
 {
   expired_kill_task = NULL;
   plugin->api->get_expiration (plugin->api->cls, &expired_processor, NULL);
@@ -1579,8 +1576,7 @@ process_stat_done (void *cls,
  * Task run during shutdown.
  */
 static void
-cleaning_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)
 {
   struct TransmitCallbackContext *tcc;
 
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index e430bfe93..41cac1283 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -186,11 +186,9 @@ struct CpsRunContext
  * depending on the current state.
  *
  * @param cls the `struct CpsRunContext`
- * @param tc scheduler context (unused)
  */
 static void
-run_continuation (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_continuation (void *cls);
 
 
 /**
@@ -344,18 +342,18 @@ delete_value (void *cls,
  * depending on the current state.
  *
  * @param cls the `struct CpsRunContext`
- * @param tc scheduler context (unused)
  */
 static void
-run_continuation (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_continuation (void *cls)
 {
   struct CpsRunContext *crc = cls;
   size_t size;
   static struct GNUNET_HashCode key;
   static char data[65536];
   char gstr[128];
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     crc->phase = RP_ERROR;
   ok = (int) crc->phase;
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 4365fbd25..0aeb426ab 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -99,8 +99,7 @@ disk_utilization_change_cb (void *cls, int delta)
 
 
 static void
-test (void *cls, 
-      const struct GNUNET_SCHEDULER_TaskContext *tc);
+test (void *cls);
 
 
 /**
@@ -115,8 +114,8 @@ test (void *cls,
 static void
 put_continuation (void *cls,
                   const struct GNUNET_HashCode *key,
-                  uint32_t size, 
-                  int status, 
+                  uint32_t size,
+                  int status,
                   const char *msg)
 {
   struct CpsRunContext *crc = cls;
@@ -376,7 +375,7 @@ unload_plugin (struct GNUNET_DATASTORE_PluginFunctions *api,
  * the transport and core.
  */
 static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)
 {
   struct CpsRunContext *crc = cls;
 
@@ -386,10 +385,12 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+test (void *cls)
 {
   struct CpsRunContext *crc = cls;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
   {
     GNUNET_break (0);
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 12f2ef762..7d4565de6 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -168,11 +168,9 @@ struct CpsRunContext
  * depending on the current state.
  *
  * @param cls the `struct CpsRunContext`
- * @param tc scheduler context (unused)
  */
 static void
-run_continuation (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_continuation (void *cls);
 
 
 /**
@@ -394,11 +392,9 @@ check_update (void *cls,
  * depending on the current state.
  *
  * @param cls the `struct CpsRunContext`
- * @param tc scheduler context (unused)
  */
 static void
-run_continuation (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_continuation (void *cls)
 {
   struct CpsRunContext *crc = cls;
 
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 9ef83c55c..c9fec79e3 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -119,7 +119,7 @@ get_expiration (int i)
 
 
 static void
-run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+run_continuation (void *cls);
 
 
 static void
@@ -182,7 +182,7 @@ check_nothing (void *cls, const struct GNUNET_HashCode * key, size_t size,
 
 
 static void
-run_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_continuation (void *cls)
 {
   struct CpsRunContext *crc = cls;
 
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index 4efad74be..d7dff1041 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -84,8 +84,7 @@ disk_utilization_change_cb (void *cls, int delta)
 
 
 static void
-test (void *cls,
-      const struct GNUNET_SCHEDULER_TaskContext *tc);
+test (void *cls);
 
 
 /**
@@ -98,10 +97,10 @@ test (void *cls,
  * @param msg error message on error
  */
 static void
-put_continuation (void *cls, 
+put_continuation (void *cls,
                   const struct GNUNET_HashCode *key,
-                  uint32_t size, 
-                  int status, 
+                  uint32_t size,
+                  int status,
                   const char *msg)
 {
   struct CpsRunContext *crc = cls;
@@ -241,7 +240,7 @@ unload_plugin (struct GNUNET_DATASTORE_PluginFunctions *api,
  * the transport and core.
  */
 static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)
 {
   struct CpsRunContext *crc = cls;
 
@@ -251,7 +250,7 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-update_continuation (void *cls, 
+update_continuation (void *cls,
                      int status,
                      const char *msg)
 {
@@ -264,11 +263,13 @@ update_continuation (void *cls,
 
 
 static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+test (void *cls)
 {
   struct CpsRunContext *crc = cls;
   struct GNUNET_HashCode key;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test aborted.\n");
@@ -302,9 +303,9 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   case RP_UPDATE:
     crc->api->update (crc->api->cls,
                       guid,
-                      1, 
+                      1,
                       GNUNET_TIME_UNIT_ZERO_ABS,
-                      &update_continuation, 
+                      &update_continuation,
                       crc);
     break;
 
@@ -344,8 +345,8 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
   char *libname;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg, 
-                                             "DATASTORE", 
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "DATASTORE",
                                              "DATABASE",
                                              &name))
   {
@@ -366,7 +367,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
     FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
     GNUNET_free (libname);
     GNUNET_free (name);
-    ok = 77; /* mark test as skipped */    
+    ok = 77; /* mark test as skipped */
     return NULL;
   }
   GNUNET_free (libname);