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/fs_test_lib.h | |
parent | 7217c601ad30760872823193d62307e7a335d226 (diff) | |
download | gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip |
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/fs/fs_test_lib.h')
-rw-r--r-- | src/fs/fs_test_lib.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 666fad196..b348dfe78 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h | |||
@@ -41,7 +41,6 @@ struct GNUNET_FS_TestDaemon; | |||
41 | /** | 41 | /** |
42 | * Start daemons for testing. | 42 | * Start daemons for testing. |
43 | * | 43 | * |
44 | * @param sched scheduler to use | ||
45 | * @param template_cfg_file configuration template to use | 44 | * @param template_cfg_file configuration template to use |
46 | * @param timeout if this operation cannot be completed within the | 45 | * @param timeout if this operation cannot be completed within the |
47 | * given period, call the continuation with an error code | 46 | * given period, call the continuation with an error code |
@@ -55,8 +54,7 @@ struct GNUNET_FS_TestDaemon; | |||
55 | * @param cont_cls closure for cont | 54 | * @param cont_cls closure for cont |
56 | */ | 55 | */ |
57 | void | 56 | void |
58 | GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, | 57 | GNUNET_FS_TEST_daemons_start (const char *template_cfg_file, |
59 | const char *template_cfg_file, | ||
60 | struct GNUNET_TIME_Relative timeout, | 58 | struct GNUNET_TIME_Relative timeout, |
61 | unsigned int total, | 59 | unsigned int total, |
62 | struct GNUNET_FS_TestDaemon **daemons, | 60 | struct GNUNET_FS_TestDaemon **daemons, |
@@ -67,7 +65,6 @@ GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, | |||
67 | /** | 65 | /** |
68 | * Connect two daemons for testing. | 66 | * Connect two daemons for testing. |
69 | * | 67 | * |
70 | * @param sched scheduler to use | ||
71 | * @param daemon1 first daemon to connect | 68 | * @param daemon1 first daemon to connect |
72 | * @param daemon2 second first daemon to connect | 69 | * @param daemon2 second first daemon to connect |
73 | * @param timeout if this operation cannot be completed within the | 70 | * @param timeout if this operation cannot be completed within the |
@@ -76,8 +73,7 @@ GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched, | |||
76 | * @param cont_cls closure for cont | 73 | * @param cont_cls closure for cont |
77 | */ | 74 | */ |
78 | void | 75 | void |
79 | GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched, | 76 | GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1, |
80 | struct GNUNET_FS_TestDaemon *daemon1, | ||
81 | struct GNUNET_FS_TestDaemon *daemon2, | 77 | struct GNUNET_FS_TestDaemon *daemon2, |
82 | struct GNUNET_TIME_Relative timeout, | 78 | struct GNUNET_TIME_Relative timeout, |
83 | GNUNET_SCHEDULER_Task cont, | 79 | GNUNET_SCHEDULER_Task cont, |
@@ -109,13 +105,11 @@ GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons, | |||
109 | /** | 105 | /** |
110 | * Stop daemons used for testing. | 106 | * Stop daemons used for testing. |
111 | * | 107 | * |
112 | * @param sched scheduler to use | ||
113 | * @param total number of daemons to stop | 108 | * @param total number of daemons to stop |
114 | * @param daemons array with the daemons (values will be clobbered) | 109 | * @param daemons array with the daemons (values will be clobbered) |
115 | */ | 110 | */ |
116 | void | 111 | void |
117 | GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched, | 112 | GNUNET_FS_TEST_daemons_stop (unsigned int total, |
118 | unsigned int total, | ||
119 | struct GNUNET_FS_TestDaemon **daemons); | 113 | struct GNUNET_FS_TestDaemon **daemons); |
120 | 114 | ||
121 | 115 | ||
@@ -133,7 +127,6 @@ typedef void | |||
133 | /** | 127 | /** |
134 | * Publish a file at the given daemon. | 128 | * Publish a file at the given daemon. |
135 | * | 129 | * |
136 | * @param sched scheduler to use | ||
137 | * @param daemon where to publish | 130 | * @param daemon where to publish |
138 | * @param timeout if this operation cannot be completed within the | 131 | * @param timeout if this operation cannot be completed within the |
139 | * given period, call the continuation with an error code | 132 | * given period, call the continuation with an error code |
@@ -147,8 +140,7 @@ typedef void | |||
147 | * @param cont_cls closure for cont | 140 | * @param cont_cls closure for cont |
148 | */ | 141 | */ |
149 | void | 142 | void |
150 | GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched, | 143 | GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon, |
151 | struct GNUNET_FS_TestDaemon *daemon, | ||
152 | struct GNUNET_TIME_Relative timeout, | 144 | struct GNUNET_TIME_Relative timeout, |
153 | uint32_t anonymity, | 145 | uint32_t anonymity, |
154 | int do_index, | 146 | int do_index, |
@@ -162,7 +154,6 @@ GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched, | |||
162 | /** | 154 | /** |
163 | * Perform test download. | 155 | * Perform test download. |
164 | * | 156 | * |
165 | * @param sched scheduler to use | ||
166 | * @param daemon which peer to download from | 157 | * @param daemon which peer to download from |
167 | * @param timeout if this operation cannot be completed within the | 158 | * @param timeout if this operation cannot be completed within the |
168 | * given period, call the continuation with an error code | 159 | * given period, call the continuation with an error code |
@@ -174,8 +165,7 @@ GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched, | |||
174 | * @param cont_cls closure for cont | 165 | * @param cont_cls closure for cont |
175 | */ | 166 | */ |
176 | void | 167 | void |
177 | GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched, | 168 | GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon, |
178 | struct GNUNET_FS_TestDaemon *daemon, | ||
179 | struct GNUNET_TIME_Relative timeout, | 169 | struct GNUNET_TIME_Relative timeout, |
180 | uint32_t anonymity, | 170 | uint32_t anonymity, |
181 | uint32_t seed, | 171 | uint32_t seed, |