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/fs/test_fs_namespace.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/fs/test_fs_namespace.c')
-rw-r--r-- | src/fs/test_fs_namespace.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index b7641ab3b..0d37affa2 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c | |||
@@ -35,8 +35,6 @@ | |||
35 | 35 | ||
36 | #define START_ARM GNUNET_YES | 36 | #define START_ARM GNUNET_YES |
37 | 37 | ||
38 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
39 | |||
40 | static struct PeerContext p1; | 38 | static struct PeerContext p1; |
41 | 39 | ||
42 | static GNUNET_HashCode nsid; | 40 | static GNUNET_HashCode nsid; |
@@ -151,8 +149,7 @@ progress_cb (void *cls, | |||
151 | err = 1; | 149 | err = 1; |
152 | } | 150 | } |
153 | /* give system 1ms to initiate update search! */ | 151 | /* give system 1ms to initiate update search! */ |
154 | GNUNET_SCHEDULER_add_delayed (sched, | 152 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS, |
155 | GNUNET_TIME_UNIT_MILLISECONDS, | ||
156 | &abort_sks_search_task, | 153 | &abort_sks_search_task, |
157 | NULL); | 154 | NULL); |
158 | } | 155 | } |
@@ -165,8 +162,7 @@ progress_cb (void *cls, | |||
165 | "Wrong result for ksk search!\n"); | 162 | "Wrong result for ksk search!\n"); |
166 | err = 1; | 163 | err = 1; |
167 | } | 164 | } |
168 | GNUNET_SCHEDULER_add_continuation (sched, | 165 | GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, |
169 | &abort_ksk_search_task, | ||
170 | NULL, | 166 | NULL, |
171 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 167 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
172 | } | 168 | } |
@@ -182,13 +178,11 @@ progress_cb (void *cls, | |||
182 | "Error searching file: %s\n", | 178 | "Error searching file: %s\n", |
183 | event->value.search.specifics.error.message); | 179 | event->value.search.specifics.error.message); |
184 | if (sks_search == event->value.search.sc) | 180 | if (sks_search == event->value.search.sc) |
185 | GNUNET_SCHEDULER_add_continuation (sched, | 181 | GNUNET_SCHEDULER_add_continuation (&abort_sks_search_task, |
186 | &abort_sks_search_task, | ||
187 | NULL, | 182 | NULL, |
188 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 183 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
189 | else if (ksk_search == event->value.search.sc) | 184 | else if (ksk_search == event->value.search.sc) |
190 | GNUNET_SCHEDULER_add_continuation (sched, | 185 | GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, |
191 | &abort_ksk_search_task, | ||
192 | NULL, | 186 | NULL, |
193 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 187 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
194 | else | 188 | else |
@@ -384,15 +378,12 @@ testNamespace () | |||
384 | 378 | ||
385 | static void | 379 | static void |
386 | run (void *cls, | 380 | run (void *cls, |
387 | struct GNUNET_SCHEDULER_Handle *s, | ||
388 | char *const *args, | 381 | char *const *args, |
389 | const char *cfgfile, | 382 | const char *cfgfile, |
390 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 383 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
391 | { | 384 | { |
392 | sched = s; | ||
393 | setup_peer (&p1, "test_fs_namespace_data.conf"); | 385 | setup_peer (&p1, "test_fs_namespace_data.conf"); |
394 | fs = GNUNET_FS_start (sched, | 386 | fs = GNUNET_FS_start (cfg, |
395 | cfg, | ||
396 | "test-fs-namespace", | 387 | "test-fs-namespace", |
397 | &progress_cb, | 388 | &progress_cb, |
398 | NULL, | 389 | NULL, |