From 1ad257905ce4a45bbe59b08ea52a3c3c6622da5d Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 20 Jun 2011 09:05:51 +0000 Subject: [PATCH] --- src/transport/test_transport_api.c | 9 +++++--- .../test_transport_api_reliability.c | 19 +++++++++++------ .../test_transport_api_unreliability.c | 21 ++++++++++++------- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 966f66fff..3da87d2c8 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -102,7 +102,8 @@ static void end () { GNUNET_assert (ok == 6); - GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); if (th != NULL) @@ -250,8 +251,10 @@ notify_connect (void *cls, GNUNET_assert (ok >= 2); OKPP; OKPP; - GNUNET_SCHEDULER_cancel (die_task); - GNUNET_SCHEDULER_cancel (tct); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != tct) + GNUNET_SCHEDULER_cancel (tct); tct = GNUNET_SCHEDULER_NO_TASK; GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2); GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1); diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 3964b43ef..50a9cc80e 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -114,7 +114,8 @@ end () unsigned long long delta; char *value_name; - GNUNET_SCHEDULER_cancel (die_task); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_NO_TASK; #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); @@ -227,7 +228,8 @@ notify_receive (void *cls, n, s, ntohs (message->size), ntohl (hdr->num)); - GNUNET_SCHEDULER_cancel (die_task); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -238,7 +240,8 @@ notify_receive (void *cls, n, s, ntohs (message->size), ntohl (hdr->num)); - GNUNET_SCHEDULER_cancel (die_task); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -250,7 +253,8 @@ notify_receive (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Expected message %u with bits %u, but body did not match\n", n, (unsigned char) n); - GNUNET_SCHEDULER_cancel (die_task); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -267,7 +271,8 @@ notify_receive (void *cls, if (0 == (n % (TOTAL_MSGS/100))) { fprintf (stderr, "."); - GNUNET_SCHEDULER_cancel (die_task); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); @@ -420,7 +425,9 @@ notify_connect (void *cls, } if (2 == connected) { - GNUNET_SCHEDULER_cancel (die_task); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); + if (tct != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (tct); tct = GNUNET_SCHEDULER_NO_TASK; GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2); diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index 90a53c2b8..0cfc036de 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c @@ -164,7 +164,8 @@ end () } } - GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != tct) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_NO_TASK; #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); @@ -325,7 +326,8 @@ notify_receive (void *cls, ntohl(hdr->num), s, ntohs (message->size), ntohl (hdr->num)); - GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -338,7 +340,8 @@ notify_receive (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Expected message %u with bits %u, but body did not match\n", ntohl(hdr->num), (unsigned char) n); - GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -356,7 +359,8 @@ notify_receive (void *cls, if (0 == (n % (5000))) { fprintf (stderr, "."); - GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); @@ -425,7 +429,8 @@ notify_ready (void *cls, size_t size, void *buf) else { GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All messages scheduled to be sent!!\n"); - GNUNET_SCHEDULER_cancel(die_task); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel(die_task); die_task = GNUNET_SCHEDULER_add_delayed (UNRELIABLE_TIMEOUT, &end_unreliably, NULL); } if (n % 5000 == 0) @@ -519,8 +524,10 @@ notify_connect (void *cls, } if (2 == connected) { - GNUNET_SCHEDULER_cancel (die_task); - GNUNET_SCHEDULER_cancel (tct); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (tct); tct = GNUNET_SCHEDULER_NO_TASK; GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2); GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1); -- 2.25.1