diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-30 08:17:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-30 08:17:37 +0000 |
commit | 95f9076a2139f5fb042b944a0658b6cda2fa35db (patch) | |
tree | b0826a2a1dcf812e6b4450fe6b05d47cd53ae49d /src/testbed/test_testbed_api_3peers_3controllers.c | |
parent | 7746f68db77b9ca3c4aaca24ab2ce5253461240b (diff) | |
download | gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.tar.gz gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.zip |
implementing new scheduler shutdown semantics
Diffstat (limited to 'src/testbed/test_testbed_api_3peers_3controllers.c')
-rw-r--r-- | src/testbed/test_testbed_api_3peers_3controllers.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index a728048f3..0ee1fc566 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c | |||
@@ -301,6 +301,7 @@ do_abort (void *cls) | |||
301 | do_shutdown (cls); | 301 | do_shutdown (cls); |
302 | } | 302 | } |
303 | 303 | ||
304 | |||
304 | static void | 305 | static void |
305 | abort_test () | 306 | abort_test () |
306 | { | 307 | { |
@@ -842,10 +843,11 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, | |||
842 | * @param cls NULL | 843 | * @param cls NULL |
843 | * @param host the host whose status is being reported; will be NULL if the host | 844 | * @param host the host whose status is being reported; will be NULL if the host |
844 | * given to GNUNET_TESTBED_is_host_habitable() is NULL | 845 | * given to GNUNET_TESTBED_is_host_habitable() is NULL |
845 | * @param status GNUNET_YES if it is habitable; GNUNET_NO if not | 846 | * @param status #GNUNET_YES if it is habitable; #GNUNET_NO if not |
846 | */ | 847 | */ |
847 | static void | 848 | static void |
848 | host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host, | 849 | host_habitable_cb (void *cls, |
850 | const struct GNUNET_TESTBED_Host *_host, | ||
849 | int status) | 851 | int status) |
850 | { | 852 | { |
851 | hc_handle = NULL; | 853 | hc_handle = NULL; |
@@ -857,7 +859,7 @@ host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host, | |||
857 | "Skipping test\n"); | 859 | "Skipping test\n"); |
858 | GNUNET_SCHEDULER_cancel (abort_task); | 860 | GNUNET_SCHEDULER_cancel (abort_task); |
859 | abort_task = NULL; | 861 | abort_task = NULL; |
860 | (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 862 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
861 | result = SKIP; | 863 | result = SKIP; |
862 | return; | 864 | return; |
863 | } | 865 | } |