8 files changed, 36 insertions, 32 deletions

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index a4a925847..b8da23df9 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -415,8 +415,9 @@ load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg)
   return e_counter;
 }
 
+
 static void
-timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_experiment (void *cls)
 {
   struct Experiment *e = cls;
   e->experiment_timeout_task = NULL;
@@ -432,6 +433,7 @@ timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
       GNUNET_SYSERR);
 }
 
+
 static void
 enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
 {
@@ -573,10 +575,12 @@ static void enforce_episode (struct Episode *ep)
   }
 }
 
+
 static void
-timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_episode (void *cls)
 {
   struct Experiment *e = cls;
+
   e->episode_timeout_task = NULL;
   if (NULL != e->ep_done_cb)
     e->ep_done_cb (e->cur);
@@ -741,4 +745,3 @@ GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e)
 }
 
 /* end of file ats-testing-experiment.c*/
-
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c
index fff70052d..650be29f3 100644
--- a/src/ats-tests/ats-testing-log.c
+++ b/src/ats-tests/ats-testing-log.c
@@ -799,21 +799,24 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l)
   }
 }
 
+
 static void
-collect_log_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+collect_log_task (void *cls)
 {
   struct LoggingHandle *l = cls;
-  l->log_task = NULL;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  l->log_task = NULL;
   GNUNET_ATS_TEST_logging_now (l);
-
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
     return;
-
   l->log_task = GNUNET_SCHEDULER_add_delayed (l->frequency,
-      &collect_log_task, l);
+                                              &collect_log_task,
+                                              l);
 }
 
+
 /**
  * Stop logging
  *
@@ -905,4 +908,3 @@ GNUNET_ATS_TEST_logging_start(struct GNUNET_TIME_Relative log_frequency,
   return l;
 }
 /* end of file ats-testing-log.c */
-
diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c
index b8cf205ec..856c8de4b 100644
--- a/src/ats-tests/ats-testing-preferences.c
+++ b/src/ats-tests/ats-testing-preferences.c
@@ -91,8 +91,7 @@ get_preference (struct PreferenceGenerator *pg)
 
 
 static void
-set_pref_task (void *cls,
-                    const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_pref_task (void *cls)
 {
   struct BenchmarkPartner *p = cls;
   double pref_value;
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c
index 4446be171..5eb01bd55 100644
--- a/src/ats-tests/ats-testing-traffic.c
+++ b/src/ats-tests/ats-testing-traffic.c
@@ -166,8 +166,7 @@ send_ping_ready_cb (void *cls, size_t size, void *buf)
 
 
 static void
-comm_schedule_send (void *cls,
-                    const struct GNUNET_SCHEDULER_TaskContext *tc)
+comm_schedule_send (void *cls)
 {
   struct BenchmarkPartner *p = cls;
 
@@ -431,4 +430,3 @@ GNUNET_ATS_TEST_generate_traffic_stop_all ()
 }
 
 /* end of file ats-testing-traffic.c */
-
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index a3a6b9623..49aa5a052 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -52,14 +52,14 @@ struct GNUNET_CONFIGURATION_Handle *cfg;
 
 struct GNUNET_ATS_TEST_Topology *top;
 
+
 /**
  * Shutdown nicely
  *
  * @param cls NULL
- * @param tc the task context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   int c_m;
   int c_s;
@@ -437,7 +437,7 @@ connect_completion_callback (void *cls, struct GNUNET_TESTBED_Operation *op,
 }
 
 static void
-do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_connect_peers (void *cls)
 {
   int c_m;
   int c_s;
@@ -506,7 +506,7 @@ comm_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
 }
 
 static void
-do_comm_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_comm_connect (void *cls)
 {
   int c_s;
   int c_m;
@@ -649,7 +649,7 @@ ats_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
 
 
 static void
-do_connect_ats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_connect_ats (void *cls)
 {
   int c_m;
   int c_s;
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c
index e0d85094c..0d2460b7f 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -418,8 +418,9 @@ load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg)
   return e_counter;
 }
 
+
 static void
-timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_experiment (void *cls)
 {
   struct Experiment *e = cls;
   e->experiment_timeout_task = NULL;
@@ -435,6 +436,7 @@ timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
       GNUNET_SYSERR);
 }
 
+
 static void
 enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
 {
@@ -584,8 +586,9 @@ static void enforce_episode (struct Episode *ep)
   }
 }
 
+
 static void
-timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_episode (void *cls)
 {
   struct Experiment *e = cls;
   e->episode_timeout_task = NULL;
@@ -931,4 +934,3 @@ main (int argc, char *argv[])
   return 0;
 }
 /* end of file ats-testing-experiment.c*/
-
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c
index c49d5f03d..4c22043e5 100644
--- a/src/ats-tests/perf_ats.c
+++ b/src/ats-tests/perf_ats.c
@@ -185,10 +185,9 @@ evaluate ()
  * Shutdown nicely
  *
  * @param cls NULL
- * @param tc the task context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
 
   if (GNUNET_YES == logging)
@@ -223,8 +222,9 @@ print_progress ()
       &print_progress, NULL );
 }
 
+
 static void
-ats_pref_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ats_pref_task (void *cls)
 {
   struct BenchmarkPeer *me = cls;
 
diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c
index d3c6ed9c5..1e4b15432 100644
--- a/src/ats-tests/perf_ats_logging.c
+++ b/src/ats-tests/perf_ats_logging.c
@@ -637,17 +637,19 @@ collect_log_now (void)
 }
 
 static void
-collect_log_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+collect_log_task (void *cls)
 {
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
+
   log_task = NULL;
 
   collect_log_now();
-
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
     return;
 
   log_task = GNUNET_SCHEDULER_add_delayed (frequency,
-      &collect_log_task, NULL);
+                                           &collect_log_task, NULL);
 }
 
 
@@ -655,7 +657,6 @@ void
 perf_logging_stop ()
 {
   int c_m;
-  struct GNUNET_SCHEDULER_TaskContext tc;
   struct PeerLoggingTimestep *cur;
 
   if (GNUNET_YES!= running)
@@ -664,8 +665,7 @@ perf_logging_stop ()
   if (NULL != log_task)
     GNUNET_SCHEDULER_cancel (log_task);
   log_task = NULL;
-  tc.reason = GNUNET_SCHEDULER_REASON_SHUTDOWN;
-  collect_log_task (NULL, &tc);
+  collect_log_task (NULL);
 
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
       _("Stop logging\n"));
@@ -685,6 +685,7 @@ perf_logging_stop ()
   GNUNET_free (lp);
 }
 
+
 void
 perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
     char * testname, struct BenchmarkPeer *masters, int num_masters)
@@ -710,4 +711,3 @@ perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
   running = GNUNET_YES;
 }
 /* end of file perf_ats_logging.c */
-