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_search_persistence.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_search_persistence.c')
-rw-r--r-- | src/fs/test_fs_search_persistence.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index d755a9582..4def3fe6a 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c | |||
@@ -61,8 +61,6 @@ static struct PeerContext p1; | |||
61 | 61 | ||
62 | static struct GNUNET_TIME_Absolute start; | 62 | static struct GNUNET_TIME_Absolute start; |
63 | 63 | ||
64 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
65 | |||
66 | static struct GNUNET_FS_Handle *fs; | 64 | static struct GNUNET_FS_Handle *fs; |
67 | 65 | ||
68 | static struct GNUNET_FS_SearchContext *search; | 66 | static struct GNUNET_FS_SearchContext *search; |
@@ -100,8 +98,7 @@ restart_fs_task (void *cls, | |||
100 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 98 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
101 | { | 99 | { |
102 | GNUNET_FS_stop (fs); | 100 | GNUNET_FS_stop (fs); |
103 | fs = GNUNET_FS_start (sched, | 101 | fs = GNUNET_FS_start (cfg, |
104 | cfg, | ||
105 | "test-fs-search-persistence", | 102 | "test-fs-search-persistence", |
106 | &progress_cb, | 103 | &progress_cb, |
107 | NULL, | 104 | NULL, |
@@ -129,8 +126,7 @@ consider_restart (int ev) | |||
129 | if (prev[i] == ev) | 126 | if (prev[i] == ev) |
130 | return; | 127 | return; |
131 | prev[off++] = ev; | 128 | prev[off++] = ev; |
132 | GNUNET_SCHEDULER_add_with_priority (sched, | 129 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_URGENT, |
133 | GNUNET_SCHEDULER_PRIORITY_URGENT, | ||
134 | &restart_fs_task, | 130 | &restart_fs_task, |
135 | NULL); | 131 | NULL); |
136 | } | 132 | } |
@@ -181,8 +177,7 @@ progress_cb (void *cls, | |||
181 | #if VERBOSE | 177 | #if VERBOSE |
182 | printf ("Search complete.\n"); | 178 | printf ("Search complete.\n"); |
183 | #endif | 179 | #endif |
184 | GNUNET_SCHEDULER_add_continuation (sched, | 180 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, |
185 | &abort_search_task, | ||
186 | NULL, | 181 | NULL, |
187 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 182 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
188 | break; | 183 | break; |
@@ -191,8 +186,7 @@ progress_cb (void *cls, | |||
191 | "Error publishing file: %s\n", | 186 | "Error publishing file: %s\n", |
192 | event->value.publish.specifics.error.message); | 187 | event->value.publish.specifics.error.message); |
193 | GNUNET_break (0); | 188 | GNUNET_break (0); |
194 | GNUNET_SCHEDULER_add_continuation (sched, | 189 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, |
195 | &abort_publish_task, | ||
196 | NULL, | 190 | NULL, |
197 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 191 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
198 | break; | 192 | break; |
@@ -200,8 +194,7 @@ progress_cb (void *cls, | |||
200 | fprintf (stderr, | 194 | fprintf (stderr, |
201 | "Error searching file: %s\n", | 195 | "Error searching file: %s\n", |
202 | event->value.search.specifics.error.message); | 196 | event->value.search.specifics.error.message); |
203 | GNUNET_SCHEDULER_add_continuation (sched, | 197 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, |
204 | &abort_search_task, | ||
205 | NULL, | 198 | NULL, |
206 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 199 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
207 | break; | 200 | break; |
@@ -241,8 +234,7 @@ progress_cb (void *cls, | |||
241 | break; | 234 | break; |
242 | case GNUNET_FS_STATUS_SEARCH_STOPPED: | 235 | case GNUNET_FS_STATUS_SEARCH_STOPPED: |
243 | GNUNET_assert (search == event->value.search.sc); | 236 | GNUNET_assert (search == event->value.search.sc); |
244 | GNUNET_SCHEDULER_add_continuation (sched, | 237 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, |
245 | &abort_publish_task, | ||
246 | NULL, | 238 | NULL, |
247 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 239 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
248 | search = NULL; | 240 | search = NULL; |
@@ -292,7 +284,6 @@ stop_arm (struct PeerContext *p) | |||
292 | 284 | ||
293 | static void | 285 | static void |
294 | run (void *cls, | 286 | run (void *cls, |
295 | struct GNUNET_SCHEDULER_Handle *s, | ||
296 | char *const *args, | 287 | char *const *args, |
297 | const char *cfgfile, | 288 | const char *cfgfile, |
298 | const struct GNUNET_CONFIGURATION_Handle *c) | 289 | const struct GNUNET_CONFIGURATION_Handle *c) |
@@ -307,11 +298,9 @@ run (void *cls, | |||
307 | struct GNUNET_FS_FileInformation *fi; | 298 | struct GNUNET_FS_FileInformation *fi; |
308 | size_t i; | 299 | size_t i; |
309 | 300 | ||
310 | sched = s; | ||
311 | cfg = c; | 301 | cfg = c; |
312 | setup_peer (&p1, "test_fs_search_data.conf"); | 302 | setup_peer (&p1, "test_fs_search_data.conf"); |
313 | fs = GNUNET_FS_start (sched, | 303 | fs = GNUNET_FS_start (cfg, |
314 | cfg, | ||
315 | "test-fs-search-persistence", | 304 | "test-fs-search-persistence", |
316 | &progress_cb, | 305 | &progress_cb, |
317 | NULL, | 306 | NULL, |