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_ranking.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/fs/test_fs_search_ranking.c')
-rw-r--r-- | src/fs/test_fs_search_ranking.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c index b19ff97bf..53522c6fe 100644 --- a/src/fs/test_fs_search_ranking.c +++ b/src/fs/test_fs_search_ranking.c | |||
@@ -38,8 +38,7 @@ makeName (unsigned int i) | |||
38 | char *fn; | 38 | char *fn; |
39 | 39 | ||
40 | fn = GNUNET_malloc (strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14); | 40 | fn = GNUNET_malloc (strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14); |
41 | GNUNET_snprintf (fn, | 41 | GNUNET_snprintf (fn, strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14, |
42 | strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14, | ||
43 | "/tmp/gnunet-fsui-searchranktest/FSUITEST%u", i); | 42 | "/tmp/gnunet-fsui-searchranktest/FSUITEST%u", i); |
44 | GNUNET_disk_directory_create_for_file (NULL, fn); | 43 | GNUNET_disk_directory_create_for_file (NULL, fn); |
45 | return fn; | 44 | return fn; |
@@ -159,22 +158,21 @@ main (int argc, char *argv[]) | |||
159 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ | 158 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ |
160 | /* ACTUAL TEST CODE */ | 159 | /* ACTUAL TEST CODE */ |
161 | #endif | 160 | #endif |
162 | ctx = GNUNET_FSUI_start (NULL, | 161 | ctx = |
163 | cfg, "fsuisearchranktest", 32, GNUNET_YES, | 162 | GNUNET_FSUI_start (NULL, cfg, "fsuisearchranktest", 32, GNUNET_YES, |
164 | &eventCallback, NULL); | 163 | &eventCallback, NULL); |
165 | CHECK (ctx != NULL); | 164 | CHECK (ctx != NULL); |
166 | /* upload */ | 165 | /* upload */ |
167 | fn = makeName (42); | 166 | fn = makeName (42); |
168 | GNUNET_disk_file_write (NULL, | 167 | GNUNET_disk_file_write (NULL, fn, "foo bar test!", strlen ("foo bar test!"), |
169 | fn, "foo bar test!", strlen ("foo bar test!"), "600"); | 168 | "600"); |
170 | meta = GNUNET_meta_data_create (); | 169 | meta = GNUNET_meta_data_create (); |
171 | kuri = | 170 | kuri = |
172 | GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2, | 171 | GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2, |
173 | (const char **) keywords); | 172 | (const char **) keywords); |
174 | waitForEvent = GNUNET_FSUI_upload_completed; | 173 | waitForEvent = GNUNET_FSUI_upload_completed; |
175 | upload = | 174 | upload = |
176 | GNUNET_FSUI_upload_start (ctx, | 175 | GNUNET_FSUI_upload_start (ctx, fn, |
177 | fn, | ||
178 | (GNUNET_FSUI_DirectoryScanCallback) & | 176 | (GNUNET_FSUI_DirectoryScanCallback) & |
179 | GNUNET_disk_directory_scan, NULL, 0, 0, | 177 | GNUNET_disk_directory_scan, NULL, 0, 0, |
180 | GNUNET_YES, GNUNET_NO, GNUNET_NO, | 178 | GNUNET_YES, GNUNET_NO, GNUNET_NO, |
@@ -191,8 +189,8 @@ main (int argc, char *argv[]) | |||
191 | prog++; | 189 | prog++; |
192 | if (prog == 10000) | 190 | if (prog == 10000) |
193 | { | 191 | { |
194 | fprintf (stderr, | 192 | fprintf (stderr, "Upload failed to complete -- last event: %u\n", |
195 | "Upload failed to complete -- last event: %u\n", lastEvent); | 193 | lastEvent); |
196 | } | 194 | } |
197 | CHECK (prog < 10000); | 195 | CHECK (prog < 10000); |
198 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | 196 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); |
@@ -211,9 +209,8 @@ main (int argc, char *argv[]) | |||
211 | CHECK (NULL != search); | 209 | CHECK (NULL != search); |
212 | GNUNET_FSUI_search_pause (search); | 210 | GNUNET_FSUI_search_pause (search); |
213 | GNUNET_FSUI_search_restart (search); | 211 | GNUNET_FSUI_search_restart (search); |
214 | while ((uri == NULL) && | 212 | while ((uri == NULL) && (availability < 3) && (rank != 2) && |
215 | (availability < 3) && | 213 | (GNUNET_shutdown_test () != GNUNET_YES)) |
216 | (rank != 2) && (GNUNET_shutdown_test () != GNUNET_YES)) | ||
217 | { | 214 | { |
218 | prog++; | 215 | prog++; |
219 | CHECK (prog < 10000); | 216 | CHECK (prog < 10000); |