diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-11-05 18:21:50 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-11-05 18:21:50 +0000 |
commit | 75a33a1499cf60ea4364c9aa673816629a6c1413 (patch) | |
tree | 0620da4312bb04de4d7b65074fdd3b0c3dd6cc0e /src/hostlist/test_gnunet_daemon_hostlist.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/hostlist/test_gnunet_daemon_hostlist.c')
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index 63ba53b69..28a8ddfcf 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c | |||
@@ -39,8 +39,6 @@ | |||
39 | 39 | ||
40 | static int ok; | 40 | static int ok; |
41 | 41 | ||
42 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
43 | |||
44 | static GNUNET_SCHEDULER_TaskIdentifier timeout_task; | 42 | static GNUNET_SCHEDULER_TaskIdentifier timeout_task; |
45 | 43 | ||
46 | struct PeerContext | 44 | struct PeerContext |
@@ -71,7 +69,7 @@ clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
71 | GNUNET_TRANSPORT_disconnect (p2.th); | 69 | GNUNET_TRANSPORT_disconnect (p2.th); |
72 | p2.th = NULL; | 70 | p2.th = NULL; |
73 | } | 71 | } |
74 | GNUNET_SCHEDULER_shutdown (sched); | 72 | GNUNET_SCHEDULER_shutdown (); |
75 | } | 73 | } |
76 | 74 | ||
77 | /** | 75 | /** |
@@ -109,12 +107,10 @@ notify_connect (void *cls, | |||
109 | ok = 0; | 107 | ok = 0; |
110 | if (timeout_task != GNUNET_SCHEDULER_NO_TASK) | 108 | if (timeout_task != GNUNET_SCHEDULER_NO_TASK) |
111 | { | 109 | { |
112 | GNUNET_SCHEDULER_cancel (sched, | 110 | GNUNET_SCHEDULER_cancel (timeout_task); |
113 | timeout_task); | ||
114 | timeout_task = GNUNET_SCHEDULER_NO_TASK; | 111 | timeout_task = GNUNET_SCHEDULER_NO_TASK; |
115 | } | 112 | } |
116 | GNUNET_SCHEDULER_add_now (sched, | 113 | GNUNET_SCHEDULER_add_now (&clean_up, NULL); |
117 | &clean_up, NULL); | ||
118 | } | 114 | } |
119 | 115 | ||
120 | 116 | ||
@@ -143,7 +139,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
143 | "-c", cfgname, NULL); | 139 | "-c", cfgname, NULL); |
144 | #endif | 140 | #endif |
145 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 141 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
146 | p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL, p, NULL, | 142 | p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, |
147 | ¬ify_connect, NULL); | 143 | ¬ify_connect, NULL); |
148 | GNUNET_assert (p->th != NULL); | 144 | GNUNET_assert (p->th != NULL); |
149 | GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); | 145 | GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); |
@@ -177,8 +173,7 @@ stop_arm (struct PeerContext *p) | |||
177 | { | 173 | { |
178 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 174 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
179 | "Asking ARM to stop core service\n"); | 175 | "Asking ARM to stop core service\n"); |
180 | GNUNET_SCHEDULER_add_delayed (sched, | 176 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
181 | GNUNET_TIME_UNIT_SECONDS, | ||
182 | &waitpid_task, p); | 177 | &waitpid_task, p); |
183 | } | 178 | } |
184 | 179 | ||
@@ -196,20 +191,16 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
196 | 191 | ||
197 | static void | 192 | static void |
198 | run (void *cls, | 193 | run (void *cls, |
199 | struct GNUNET_SCHEDULER_Handle *s, | ||
200 | char *const *args, | 194 | char *const *args, |
201 | const char *cfgfile, | 195 | const char *cfgfile, |
202 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 196 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
203 | { | 197 | { |
204 | GNUNET_assert (ok == 1); | 198 | GNUNET_assert (ok == 1); |
205 | ok++; | 199 | ok++; |
206 | sched = s; | 200 | timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
207 | timeout_task = GNUNET_SCHEDULER_add_delayed (sched, | ||
208 | TIMEOUT, | ||
209 | &timeout_error, | 201 | &timeout_error, |
210 | NULL); | 202 | NULL); |
211 | GNUNET_SCHEDULER_add_delayed (sched, | 203 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
212 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
213 | &shutdown_task, | 204 | &shutdown_task, |
214 | NULL); | 205 | NULL); |
215 | setup_peer (&p1, "test_gnunet_daemon_hostlist_peer1.conf"); | 206 | setup_peer (&p1, "test_gnunet_daemon_hostlist_peer1.conf"); |