From 29e6158507a0758192075ac6ece7ba8e75ddc49a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 9 Apr 2016 23:14:03 +0000
Subject: 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()

---
 src/transport/plugin_transport_http_server.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/transport/plugin_transport_http_server.c')

diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index cc1548f20..dfd0294e5 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -491,14 +491,14 @@ notify_session_monitor (struct HTTP_Server_Plugin *plugin,
  * Wake up an MHD connection which was suspended
  *
  * @param cls the session
- * @param tc task context
  */
 static void
-server_wake_up (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_wake_up (void *cls)
 {
   struct GNUNET_ATS_Session *s = cls;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   s->recv_wakeup_task = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
@@ -641,11 +641,9 @@ http_server_plugin_disconnect_session (void *cls,
  * Session was idle, so disconnect it
  *
  * @param cls the session
- * @param tc task context
  */
 static void
-server_session_timeout (void *cls,
-                        const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_session_timeout (void *cls)
 {
   struct GNUNET_ATS_Session *s = cls;
   struct GNUNET_TIME_Relative left;
@@ -910,15 +908,15 @@ http_server_plugin_get_session (void *cls,
  * and schedule the next run.
  *
  * @param cls plugin as closure
- * @param tc task context
  */
 static void
-server_v4_run (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_v4_run (void *cls)
 {
   struct HTTP_Server_Plugin *plugin = cls;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   plugin->server_v4_task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   plugin->server_v4_immediately = GNUNET_NO;
@@ -932,15 +930,15 @@ server_v4_run (void *cls,
  * and schedule the next run.
  *
  * @param cls plugin as closure
- * @param tc task context
  */
 static void
-server_v6_run (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_v6_run (void *cls)
 {
   struct HTTP_Server_Plugin *plugin = cls;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   plugin->server_v6_task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   plugin->server_v6_immediately = GNUNET_NO;
@@ -2844,19 +2842,19 @@ server_check_ipv6_support (struct HTTP_Server_Plugin *plugin)
  * Notify server about our external hostname
  *
  * @param cls plugin
- * @param tc task context (unused)
  */
 static void
-server_notify_external_hostname (void *cls,
-                                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_notify_external_hostname (void *cls)
 {
   struct HTTP_Server_Plugin *plugin = cls;
   struct HttpAddress *ext_addr;
   size_t ext_addr_len;
   unsigned int urlen;
   char *url;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   plugin->notify_ext_task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
 
-- 
cgit v1.2.3