diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
commit | 29e6158507a0758192075ac6ece7ba8e75ddc49a (patch) | |
tree | b91ded48da322f8ba4c9bb0f5504228aa036c2d1 /src/testbed/gnunet-service-test-barriers.c | |
parent | 5dfcb058ab5db9ae0c4b147d8a99c64ca0980028 (diff) | |
download | gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.tar.gz gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.zip |
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()
Diffstat (limited to 'src/testbed/gnunet-service-test-barriers.c')
-rw-r--r-- | src/testbed/gnunet-service-test-barriers.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c index 444cb4a6d..281172cbf 100644 --- a/src/testbed/gnunet-service-test-barriers.c +++ b/src/testbed/gnunet-service-test-barriers.c | |||
@@ -46,10 +46,9 @@ struct GNUNET_TESTBED_BarrierWaitHandle *wh; | |||
46 | * Dummy task callback to keep us running forever | 46 | * Dummy task callback to keep us running forever |
47 | * | 47 | * |
48 | * @param cls NULL | 48 | * @param cls NULL |
49 | * @param tc scheduler task context | ||
50 | */ | 49 | */ |
51 | static void | 50 | static void |
52 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 51 | do_shutdown (void *cls) |
53 | { | 52 | { |
54 | if (NULL != wh) | 53 | if (NULL != wh) |
55 | GNUNET_TESTBED_barrier_wait_cancel (wh); | 54 | GNUNET_TESTBED_barrier_wait_cancel (wh); |
@@ -80,12 +79,14 @@ barrier_wait_cb (void *cls, const char *name, int status) | |||
80 | * Task to wait for the barrier | 79 | * Task to wait for the barrier |
81 | * | 80 | * |
82 | * @param cls NULL | 81 | * @param cls NULL |
83 | * @param tc scheduler task context | ||
84 | * @return | 82 | * @return |
85 | */ | 83 | */ |
86 | static void | 84 | static void |
87 | do_wait (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 85 | do_wait (void *cls) |
88 | { | 86 | { |
87 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
88 | |||
89 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
89 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 90 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
90 | return; | 91 | return; |
91 | wh = GNUNET_TESTBED_barrier_wait (TEST_BARRIER_NAME, &barrier_wait_cb, NULL); | 92 | wh = GNUNET_TESTBED_barrier_wait (TEST_BARRIER_NAME, &barrier_wait_cb, NULL); |