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/template | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/template')
-rw-r--r-- | src/template/gnunet-service-template.c | 5 | ||||
-rw-r--r-- | src/template/gnunet-template.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c index 7270da160..96eb11e61 100644 --- a/src/template/gnunet-service-template.c +++ b/src/template/gnunet-service-template.c | |||
@@ -46,13 +46,11 @@ cleanup_task (void *cls, | |||
46 | * Process template requests. | 46 | * Process template requests. |
47 | * | 47 | * |
48 | * @param cls closure | 48 | * @param cls closure |
49 | * @param sched scheduler to use | ||
50 | * @param server the initialized server | 49 | * @param server the initialized server |
51 | * @param cfg configuration to use | 50 | * @param cfg configuration to use |
52 | */ | 51 | */ |
53 | static void | 52 | static void |
54 | run (void *cls, | 53 | run (void *cls, |
55 | struct GNUNET_SCHEDULER_Handle *sched, | ||
56 | struct GNUNET_SERVER_Handle *server, | 54 | struct GNUNET_SERVER_Handle *server, |
57 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 55 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
58 | { | 56 | { |
@@ -62,8 +60,7 @@ run (void *cls, | |||
62 | }; | 60 | }; |
63 | /* FIXME: do setup here */ | 61 | /* FIXME: do setup here */ |
64 | GNUNET_SERVER_add_handlers (server, handlers); | 62 | GNUNET_SERVER_add_handlers (server, handlers); |
65 | GNUNET_SCHEDULER_add_delayed (sched, | 63 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
66 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
67 | &cleanup_task, | 64 | &cleanup_task, |
68 | NULL); | 65 | NULL); |
69 | } | 66 | } |
diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c index cfc854016..cd4687fb7 100644 --- a/src/template/gnunet-template.c +++ b/src/template/gnunet-template.c | |||
@@ -37,14 +37,12 @@ static int ret; | |||
37 | * Main function that will be run by the scheduler. | 37 | * Main function that will be run by the scheduler. |
38 | * | 38 | * |
39 | * @param cls closure | 39 | * @param cls closure |
40 | * @param sched the scheduler to use | ||
41 | * @param args remaining command-line arguments | 40 | * @param args remaining command-line arguments |
42 | * @param cfgfile name of the configuration file used (for saving, can be NULL!) | 41 | * @param cfgfile name of the configuration file used (for saving, can be NULL!) |
43 | * @param cfg configuration | 42 | * @param cfg configuration |
44 | */ | 43 | */ |
45 | static void | 44 | static void |
46 | run (void *cls, | 45 | run (void *cls, |
47 | struct GNUNET_SCHEDULER_Handle *sched, | ||
48 | char *const *args, | 46 | char *const *args, |
49 | const char *cfgfile, | 47 | const char *cfgfile, |
50 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 48 | const struct GNUNET_CONFIGURATION_Handle *cfg) |