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_testbed_run.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_testbed_run.c')
-rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index 10beebc1f..45c9f5adf 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -86,9 +86,10 @@ do_shutdown (void *cls) | |||
86 | static void | 86 | static void |
87 | do_abort (void *cls) | 87 | do_abort (void *cls) |
88 | { | 88 | { |
89 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | ||
90 | abort_task = NULL; | 89 | abort_task = NULL; |
91 | (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 90 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
91 | "Test timed out -- Aborting\n"); | ||
92 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | ||
92 | } | 93 | } |
93 | 94 | ||
94 | 95 | ||
@@ -119,8 +120,7 @@ test_master (void *cls, | |||
119 | return; /* abort already scheduled */ | 120 | return; /* abort already scheduled */ |
120 | GNUNET_SCHEDULER_cancel (abort_task); | 121 | GNUNET_SCHEDULER_cancel (abort_task); |
121 | abort_task = NULL; | 122 | abort_task = NULL; |
122 | (void) GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 123 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); |
123 | &do_shutdown, NULL); | ||
124 | return; | 124 | return; |
125 | } | 125 | } |
126 | GNUNET_assert (NULL != peers[0]); | 126 | GNUNET_assert (NULL != peers[0]); |
@@ -168,7 +168,9 @@ controller_event_cb (void *cls, | |||
168 | * @param cfg the configuration file handle | 168 | * @param cfg the configuration file handle |
169 | */ | 169 | */ |
170 | static void | 170 | static void |
171 | run (void *cls, char *const *args, const char *cfgfile, | 171 | run (void *cls, |
172 | char *const *args, | ||
173 | const char *cfgfile, | ||
172 | const struct GNUNET_CONFIGURATION_Handle *config) | 174 | const struct GNUNET_CONFIGURATION_Handle *config) |
173 | { | 175 | { |
174 | uint64_t event_mask; | 176 | uint64_t event_mask; |
@@ -176,11 +178,13 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
176 | event_mask = 0; | 178 | event_mask = 0; |
177 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START); | 179 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START); |
178 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP); | 180 | event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP); |
179 | GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb, | 181 | GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, |
180 | NULL, &test_master, NULL); | 182 | &controller_event_cb, NULL, |
183 | &test_master, NULL); | ||
181 | abort_task = | 184 | abort_task = |
182 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 185 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
183 | (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort, | 186 | (GNUNET_TIME_UNIT_SECONDS, 300), |
187 | &do_abort, | ||
184 | NULL); | 188 | NULL); |
185 | } | 189 | } |
186 | 190 | ||