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/consensus | |
parent | 7746f68db77b9ca3c4aaca24ab2ce5253461240b (diff) | |
download | gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.tar.gz gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.zip |
implementing new scheduler shutdown semantics
Diffstat (limited to 'src/consensus')
-rw-r--r-- | src/consensus/gnunet-service-consensus.c | 2 | ||||
-rw-r--r-- | src/consensus/test_consensus_api.c | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 82b05d136..99e7aca97 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c | |||
@@ -3231,7 +3231,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
3231 | } | 3231 | } |
3232 | statistics = GNUNET_STATISTICS_create ("consensus", cfg); | 3232 | statistics = GNUNET_STATISTICS_create ("consensus", cfg); |
3233 | GNUNET_SERVER_add_handlers (server, server_handlers); | 3233 | GNUNET_SERVER_add_handlers (server, server_handlers); |
3234 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); | 3234 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); |
3235 | GNUNET_SERVER_disconnect_notify (server, handle_client_disconnect, NULL); | 3235 | GNUNET_SERVER_disconnect_notify (server, handle_client_disconnect, NULL); |
3236 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus running\n"); | 3236 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus running\n"); |
3237 | } | 3237 | } |
diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c index 0073267f8..85707eed1 100644 --- a/src/consensus/test_consensus_api.c +++ b/src/consensus/test_consensus_api.c | |||
@@ -92,10 +92,7 @@ run (void *cls, | |||
92 | GNUNET_log_setup ("test_consensus_api", | 92 | GNUNET_log_setup ("test_consensus_api", |
93 | "INFO", | 93 | "INFO", |
94 | NULL); | 94 | NULL); |
95 | 95 | GNUNET_SCHEDULER_add_shutdown (&on_shutdown, NULL); | |
96 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "testing consensus api\n"); | ||
97 | |||
98 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &on_shutdown, NULL); | ||
99 | 96 | ||
100 | GNUNET_CRYPTO_hash (str, strlen (str), &session_id); | 97 | GNUNET_CRYPTO_hash (str, strlen (str), &session_id); |
101 | consensus = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id, | 98 | consensus = GNUNET_CONSENSUS_create (cfg, 0, NULL, &session_id, |
@@ -112,10 +109,7 @@ run (void *cls, | |||
112 | int | 109 | int |
113 | main (int argc, char **argv) | 110 | main (int argc, char **argv) |
114 | { | 111 | { |
115 | int ret; | 112 | return GNUNET_TESTING_peer_run ("test_consensus_api", |
116 | 113 | "test_consensus.conf", | |
117 | ret = GNUNET_TESTING_peer_run ("test_consensus_api", | 114 | &run, NULL); |
118 | "test_consensus.conf", | ||
119 | &run, NULL); | ||
120 | return ret; | ||
121 | } | 115 | } |