From f1f603c7d0b3f03dca46a4f313472288eb080eb1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 24 Dec 2014 01:10:47 +0000 Subject: making GNUNET_SCHEDULER_cancel() perform in O(1) instead of O(n) to help or even fully address #3247 --- src/testbed/test_testbed_api_peer_reconfiguration.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/testbed/test_testbed_api_peer_reconfiguration.c') diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 6b5f3e117..3928274de 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c @@ -47,7 +47,7 @@ static struct GNUNET_TESTBED_Operation *op; /** * Abort task identifier */ -static GNUNET_SCHEDULER_TaskIdentifier abort_task; +static struct GNUNET_SCHEDULER_Task * abort_task; /** * States in this test @@ -77,7 +77,7 @@ enum { #define FAIL_TEST(cond, ret) do { \ if (!(cond)) { \ GNUNET_break(0); \ - if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ + if (NULL != abort_task) \ GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ ret; \ @@ -95,7 +95,7 @@ static void do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); - abort_task = GNUNET_SCHEDULER_NO_TASK; + abort_task = NULL; if (NULL != op) { GNUNET_TESTBED_operation_done (op); @@ -134,7 +134,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) GNUNET_TESTBED_operation_done (op); state = STATE_PEER_RECONFIGURED; GNUNET_SCHEDULER_cancel (abort_task); - abort_task = GNUNET_SCHEDULER_NO_TASK; + abort_task = NULL; GNUNET_SCHEDULER_shutdown (); } -- cgit v1.2.3