diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
commit | 5746309cb4be2073d550ad7a6885e918631dbc38 (patch) | |
tree | 89455bc4aadf977816b38df13f990372cd81d71a /src/fs/test_fs_search.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/fs/test_fs_search.c')
-rw-r--r-- | src/fs/test_fs_search.c | 70 |
1 files changed, 29 insertions, 41 deletions
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 878624c73..3961017cf 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c | |||
@@ -101,16 +101,16 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
101 | (unsigned long long) event->value.publish.completed, | 101 | (unsigned long long) event->value.publish.completed, |
102 | (unsigned long long) event->value.publish.size, | 102 | (unsigned long long) event->value.publish.size, |
103 | event->value.publish.specifics.progress.depth, | 103 | event->value.publish.specifics.progress.depth, |
104 | (unsigned long long) event->value.publish.specifics. | 104 | (unsigned long long) event->value.publish.specifics.progress. |
105 | progress.offset); | 105 | offset); |
106 | #endif | 106 | #endif |
107 | break; | 107 | break; |
108 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 108 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
109 | kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords); | 109 | kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords); |
110 | start = GNUNET_TIME_absolute_get (); | 110 | start = GNUNET_TIME_absolute_get (); |
111 | search = GNUNET_FS_search_start (fs, | 111 | search = |
112 | kuri, | 112 | GNUNET_FS_search_start (fs, kuri, 1, GNUNET_FS_SEARCH_OPTION_NONE, |
113 | 1, GNUNET_FS_SEARCH_OPTION_NONE, "search"); | 113 | "search"); |
114 | GNUNET_FS_uri_destroy (kuri); | 114 | GNUNET_FS_uri_destroy (kuri); |
115 | GNUNET_assert (search != NULL); | 115 | GNUNET_assert (search != NULL); |
116 | break; | 116 | break; |
@@ -118,25 +118,20 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
118 | #if VERBOSE | 118 | #if VERBOSE |
119 | printf ("Search complete.\n"); | 119 | printf ("Search complete.\n"); |
120 | #endif | 120 | #endif |
121 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, | 121 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL, |
122 | NULL, | ||
123 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 122 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
124 | break; | 123 | break; |
125 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 124 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
126 | fprintf (stderr, | 125 | fprintf (stderr, "Error publishing file: %s\n", |
127 | "Error publishing file: %s\n", | ||
128 | event->value.publish.specifics.error.message); | 126 | event->value.publish.specifics.error.message); |
129 | GNUNET_break (0); | 127 | GNUNET_break (0); |
130 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, | 128 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, |
131 | NULL, | ||
132 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 129 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
133 | break; | 130 | break; |
134 | case GNUNET_FS_STATUS_SEARCH_ERROR: | 131 | case GNUNET_FS_STATUS_SEARCH_ERROR: |
135 | fprintf (stderr, | 132 | fprintf (stderr, "Error searching file: %s\n", |
136 | "Error searching file: %s\n", | ||
137 | event->value.search.specifics.error.message); | 133 | event->value.search.specifics.error.message); |
138 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, | 134 | GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL, |
139 | NULL, | ||
140 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 135 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
141 | break; | 136 | break; |
142 | case GNUNET_FS_STATUS_PUBLISH_START: | 137 | case GNUNET_FS_STATUS_PUBLISH_START: |
@@ -162,8 +157,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
162 | break; | 157 | break; |
163 | case GNUNET_FS_STATUS_SEARCH_STOPPED: | 158 | case GNUNET_FS_STATUS_SEARCH_STOPPED: |
164 | GNUNET_assert (search == event->value.search.sc); | 159 | GNUNET_assert (search == event->value.search.sc); |
165 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, | 160 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, |
166 | NULL, | ||
167 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 161 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
168 | break; | 162 | break; |
169 | default: | 163 | default: |
@@ -179,12 +173,13 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
179 | { | 173 | { |
180 | p->cfg = GNUNET_CONFIGURATION_create (); | 174 | p->cfg = GNUNET_CONFIGURATION_create (); |
181 | #if START_ARM | 175 | #if START_ARM |
182 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 176 | p->arm_proc = |
183 | "gnunet-service-arm", | 177 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
178 | "gnunet-service-arm", | ||
184 | #if VERBOSE | 179 | #if VERBOSE |
185 | "-L", "DEBUG", | 180 | "-L", "DEBUG", |
186 | #endif | 181 | #endif |
187 | "-c", cfgname, NULL); | 182 | "-c", cfgname, NULL); |
188 | #endif | 183 | #endif |
189 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 184 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
190 | } | 185 | } |
@@ -200,8 +195,7 @@ stop_arm (struct PeerContext *p) | |||
200 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 195 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
201 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) | 196 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) |
202 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 197 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
203 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 198 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
204 | "ARM process %u stopped\n", | ||
205 | GNUNET_OS_process_get_pid (p->arm_proc)); | 199 | GNUNET_OS_process_get_pid (p->arm_proc)); |
206 | GNUNET_OS_process_close (p->arm_proc); | 200 | GNUNET_OS_process_close (p->arm_proc); |
207 | p->arm_proc = NULL; | 201 | p->arm_proc = NULL; |
@@ -212,9 +206,8 @@ stop_arm (struct PeerContext *p) | |||
212 | 206 | ||
213 | 207 | ||
214 | static void | 208 | static void |
215 | run (void *cls, | 209 | run (void *cls, char *const *args, const char *cfgfile, |
216 | char *const *args, | 210 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
217 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
218 | { | 211 | { |
219 | const char *keywords[] = { | 212 | const char *keywords[] = { |
220 | "down_foo", | 213 | "down_foo", |
@@ -228,10 +221,8 @@ run (void *cls, | |||
228 | size_t i; | 221 | size_t i; |
229 | 222 | ||
230 | setup_peer (&p1, "test_fs_search_data.conf"); | 223 | setup_peer (&p1, "test_fs_search_data.conf"); |
231 | fs = GNUNET_FS_start (cfg, | 224 | fs = GNUNET_FS_start (cfg, "test-fs-search", &progress_cb, NULL, |
232 | "test-fs-search", | 225 | GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); |
233 | &progress_cb, | ||
234 | NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); | ||
235 | GNUNET_assert (NULL != fs); | 226 | GNUNET_assert (NULL != fs); |
236 | buf = GNUNET_malloc (FILESIZE); | 227 | buf = GNUNET_malloc (FILESIZE); |
237 | for (i = 0; i < FILESIZE; i++) | 228 | for (i = 0; i < FILESIZE; i++) |
@@ -242,19 +233,16 @@ run (void *cls, | |||
242 | bo.anonymity_level = 1; | 233 | bo.anonymity_level = 1; |
243 | bo.replication_level = 0; | 234 | bo.replication_level = 0; |
244 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); | 235 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); |
245 | fi = GNUNET_FS_file_information_create_from_data (fs, | 236 | fi = GNUNET_FS_file_information_create_from_data (fs, "publish-context", |
246 | "publish-context", | 237 | FILESIZE, buf, kuri, meta, |
247 | FILESIZE, | 238 | GNUNET_NO, &bo); |
248 | buf, | ||
249 | kuri, meta, GNUNET_NO, &bo); | ||
250 | GNUNET_FS_uri_destroy (kuri); | 239 | GNUNET_FS_uri_destroy (kuri); |
251 | GNUNET_CONTAINER_meta_data_destroy (meta); | 240 | GNUNET_CONTAINER_meta_data_destroy (meta); |
252 | GNUNET_assert (NULL != fi); | 241 | GNUNET_assert (NULL != fi); |
253 | start = GNUNET_TIME_absolute_get (); | 242 | start = GNUNET_TIME_absolute_get (); |
254 | publish = GNUNET_FS_publish_start (fs, | 243 | publish = |
255 | fi, | 244 | GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL, |
256 | NULL, NULL, NULL, | 245 | GNUNET_FS_PUBLISH_OPTION_NONE); |
257 | GNUNET_FS_PUBLISH_OPTION_NONE); | ||
258 | GNUNET_assert (publish != NULL); | 246 | GNUNET_assert (publish != NULL); |
259 | } | 247 | } |
260 | 248 | ||
@@ -282,8 +270,8 @@ main (int argc, char *argv[]) | |||
282 | "WARNING", | 270 | "WARNING", |
283 | #endif | 271 | #endif |
284 | NULL); | 272 | NULL); |
285 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, | 273 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, |
286 | argvx, "test-fs-search", "nohelp", options, &run, NULL); | 274 | "test-fs-search", "nohelp", options, &run, NULL); |
287 | stop_arm (&p1); | 275 | stop_arm (&p1); |
288 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/"); | 276 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/"); |
289 | return 0; | 277 | return 0; |