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/topology/test_gnunet_daemon_topology.c | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/topology/test_gnunet_daemon_topology.c')
-rw-r--r-- | src/topology/test_gnunet_daemon_topology.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index f6b671dc0..529496f11 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c | |||
@@ -48,8 +48,6 @@ static struct GNUNET_TESTING_Daemon *first; | |||
48 | 48 | ||
49 | static struct GNUNET_TESTING_Daemon *last; | 49 | static struct GNUNET_TESTING_Daemon *last; |
50 | 50 | ||
51 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
52 | |||
53 | /** | 51 | /** |
54 | * Check whether peers successfully shut down. | 52 | * Check whether peers successfully shut down. |
55 | */ | 53 | */ |
@@ -108,8 +106,7 @@ notify_connect_complete(void *cls, | |||
108 | { | 106 | { |
109 | /* FIXME: check that topology adds a few more links | 107 | /* FIXME: check that topology adds a few more links |
110 | in addition to those that were seeded */ | 108 | in addition to those that were seeded */ |
111 | GNUNET_SCHEDULER_add_now (sched, | 109 | GNUNET_SCHEDULER_add_now (&clean_up_task, |
112 | &clean_up_task, | ||
113 | NULL); | 110 | NULL); |
114 | } | 111 | } |
115 | } | 112 | } |
@@ -145,19 +142,17 @@ static void my_cb(void *cls, | |||
145 | 142 | ||
146 | static void | 143 | static void |
147 | run (void *cls, | 144 | run (void *cls, |
148 | struct GNUNET_SCHEDULER_Handle *s, | ||
149 | char *const *args, | 145 | char *const *args, |
150 | const char *cfgfile, | 146 | const char *cfgfile, |
151 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 147 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
152 | { | 148 | { |
153 | sched = s; | ||
154 | ok = 1; | 149 | ok = 1; |
155 | #if VERBOSE | 150 | #if VERBOSE |
156 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 151 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
157 | "Starting daemons.\n"); | 152 | "Starting daemons.\n"); |
158 | #endif | 153 | #endif |
159 | peers_left = NUM_PEERS; | 154 | peers_left = NUM_PEERS; |
160 | pg = GNUNET_TESTING_daemons_start (sched, cfg, | 155 | pg = GNUNET_TESTING_daemons_start (cfg, |
161 | peers_left, | 156 | peers_left, |
162 | TIMEOUT, | 157 | TIMEOUT, |
163 | NULL, NULL, | 158 | NULL, NULL, |