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()

4 files changed, 21 insertions, 24 deletions

diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c
index e274a1751..68ae1746f 100644
--- a/src/peerstore/gnunet-peerstore.c
+++ b/src/peerstore/gnunet-peerstore.c
@@ -32,16 +32,16 @@ static int ret;
 /*
  * Handle to PEERSTORE service
  */
-struct GNUNET_PEERSTORE_Handle *peerstore_handle;
+static struct GNUNET_PEERSTORE_Handle *peerstore_handle;
+
 
 /**
  * Run on shutdown
  *
  * @param cls unused
- * @param tc scheduler context
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   if (NULL != peerstore_handle)
   {
diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index f680c5d14..3a2d928e3 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -125,10 +125,9 @@ do_shutdown ()
  * Task run during shutdown.
  *
  * @param cls unused
- * @param tc unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   in_shutdown = GNUNET_YES;
   if (NULL == client_head)      /* Only when no connected clients. */
@@ -145,11 +144,12 @@ expire_records_continuation (void *cls, int success);
  * Deletes any expired records from storage
  */
 static void
-cleanup_expired_records (void *cls,
-                         const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_expired_records (void *cls)
 {
   int ret;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   GNUNET_assert (NULL != db);
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index a792f37ff..14117a333 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -358,10 +358,9 @@ rewatch_it (void *cls, const struct GNUNET_HashCode *key, void *value)
  * Called when the iterate request is timedout
  *
  * @param cls a `struct GNUNET_PEERSTORE_IterateContext *`
- * @param tc Scheduler task context (unused)
  */
 static void
-iterate_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+iterate_timeout (void *cls)
 {
   struct GNUNET_PEERSTORE_IterateContext *ic = cls;
   GNUNET_PEERSTORE_Processor callback;
diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c
index ad113a778..765ae9113 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -80,7 +80,7 @@ static const char *val = "test_peerstore_api_store_val";
  * @return #GNUNET_YES (all good, continue)
  */
 static int
-iterate_cb (void *cls, 
+iterate_cb (void *cls,
             const struct GNUNET_PEERSTORE_Record *record,
             const char *emsg)
 {
@@ -89,7 +89,7 @@ iterate_cb (void *cls,
   GNUNET_break (NULL == emsg);
   if (NULL == record)
   {
-    GNUNET_PEERSTORE_disconnect (h, 
+    GNUNET_PEERSTORE_disconnect (h,
                                  GNUNET_NO);
     GNUNET_SCHEDULER_shutdown ();
     return GNUNET_YES;
@@ -106,17 +106,15 @@ iterate_cb (void *cls,
  * data that should have been stored.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-test_cont (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+test_cont (void *cls)
 {
   h = GNUNET_PEERSTORE_connect (cfg);
-  GNUNET_PEERSTORE_iterate (h, 
-                            subsystem, 
+  GNUNET_PEERSTORE_iterate (h,
+                            subsystem,
                             &pid, key,
-                            GNUNET_TIME_UNIT_FOREVER_REL, 
+                            GNUNET_TIME_UNIT_FOREVER_REL,
                             &iterate_cb, NULL);
 }
 
@@ -128,15 +126,15 @@ static void
 test1 ()
 {
   h = GNUNET_PEERSTORE_connect (cfg);
-  GNUNET_PEERSTORE_store (h, 
+  GNUNET_PEERSTORE_store (h,
                           subsystem,
-                          &pid, 
-                          key, 
+                          &pid,
+                          key,
                           val, strlen (val) + 1,
                           GNUNET_TIME_UNIT_FOREVER_ABS,
-                          GNUNET_PEERSTORE_STOREOPTION_REPLACE, 
+                          GNUNET_PEERSTORE_STOREOPTION_REPLACE,
                           NULL, NULL);
-  GNUNET_PEERSTORE_disconnect (h, 
+  GNUNET_PEERSTORE_disconnect (h,
                                GNUNET_YES);
   h = NULL;
   /* We need to wait a little bit to give the disconnect
@@ -158,7 +156,7 @@ test1 ()
  * @param peer handle to our peer (unused)
  */
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *c,
      struct GNUNET_TESTING_Peer *peer)
 {
@@ -173,7 +171,7 @@ int
 main (int argc, char *argv[])
 {
   if (0 !=
-      GNUNET_TESTING_service_run ("test-gnunet-peerstore-sync", 
+      GNUNET_TESTING_service_run ("test-gnunet-peerstore-sync",
                                   "peerstore",
                                   "test_peerstore_api_data.conf",
                                   &run, NULL))