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/gnunet-search.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/fs/gnunet-search.c')
-rw-r--r-- | src/fs/gnunet-search.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index ab3f6b0c7..dddfe6b75 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c | |||
@@ -32,8 +32,6 @@ static int ret; | |||
32 | 32 | ||
33 | static const struct GNUNET_CONFIGURATION_Handle *cfg; | 33 | static const struct GNUNET_CONFIGURATION_Handle *cfg; |
34 | 34 | ||
35 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
36 | |||
37 | static struct GNUNET_FS_Handle *ctx; | 35 | static struct GNUNET_FS_Handle *ctx; |
38 | 36 | ||
39 | static struct GNUNET_FS_SearchContext *sc; | 37 | static struct GNUNET_FS_SearchContext *sc; |
@@ -185,11 +183,10 @@ progress_cb (void *cls, | |||
185 | fprintf (stderr, | 183 | fprintf (stderr, |
186 | _("Error searching: %s.\n"), | 184 | _("Error searching: %s.\n"), |
187 | info->value.search.specifics.error.message); | 185 | info->value.search.specifics.error.message); |
188 | GNUNET_SCHEDULER_shutdown (sched); | 186 | GNUNET_SCHEDULER_shutdown (); |
189 | break; | 187 | break; |
190 | case GNUNET_FS_STATUS_SEARCH_STOPPED: | 188 | case GNUNET_FS_STATUS_SEARCH_STOPPED: |
191 | GNUNET_SCHEDULER_add_continuation (sched, | 189 | GNUNET_SCHEDULER_add_continuation (&clean_task, |
192 | &clean_task, | ||
193 | NULL, | 190 | NULL, |
194 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 191 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
195 | break; | 192 | break; |
@@ -219,14 +216,12 @@ shutdown_task (void *cls, | |||
219 | * Main function that will be run by the scheduler. | 216 | * Main function that will be run by the scheduler. |
220 | * | 217 | * |
221 | * @param cls closure | 218 | * @param cls closure |
222 | * @param s the scheduler to use | ||
223 | * @param args remaining command-line arguments | 219 | * @param args remaining command-line arguments |
224 | * @param cfgfile name of the configuration file used (for saving, can be NULL!) | 220 | * @param cfgfile name of the configuration file used (for saving, can be NULL!) |
225 | * @param c configuration | 221 | * @param c configuration |
226 | */ | 222 | */ |
227 | static void | 223 | static void |
228 | run (void *cls, | 224 | run (void *cls, |
229 | struct GNUNET_SCHEDULER_Handle *s, | ||
230 | char *const *args, | 225 | char *const *args, |
231 | const char *cfgfile, | 226 | const char *cfgfile, |
232 | const struct GNUNET_CONFIGURATION_Handle *c) | 227 | const struct GNUNET_CONFIGURATION_Handle *c) |
@@ -235,7 +230,6 @@ run (void *cls, | |||
235 | unsigned int argc; | 230 | unsigned int argc; |
236 | enum GNUNET_FS_SearchOptions options; | 231 | enum GNUNET_FS_SearchOptions options; |
237 | 232 | ||
238 | sched = s; | ||
239 | argc = 0; | 233 | argc = 0; |
240 | while (NULL != args[argc]) | 234 | while (NULL != args[argc]) |
241 | argc++; | 235 | argc++; |
@@ -250,8 +244,7 @@ run (void *cls, | |||
250 | return; | 244 | return; |
251 | } | 245 | } |
252 | cfg = c; | 246 | cfg = c; |
253 | ctx = GNUNET_FS_start (sched, | 247 | ctx = GNUNET_FS_start (cfg, |
254 | cfg, | ||
255 | "gnunet-search", | 248 | "gnunet-search", |
256 | &progress_cb, | 249 | &progress_cb, |
257 | NULL, | 250 | NULL, |
@@ -285,8 +278,7 @@ run (void *cls, | |||
285 | ret = 1; | 278 | ret = 1; |
286 | return; | 279 | return; |
287 | } | 280 | } |
288 | GNUNET_SCHEDULER_add_delayed (sched, | 281 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
289 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
290 | &shutdown_task, | 282 | &shutdown_task, |
291 | NULL); | 283 | NULL); |
292 | } | 284 | } |