diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
commit | 502af2167f7c218366666ca4944bd7cc54b5b19a (patch) | |
tree | a91fec5cc9769d260640bd91c6633cb9cf395524 /src/fs/test_fs.c | |
parent | 03af5a603b7cc53432249d5854cd412aa90dde0d (diff) | |
download | gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip |
indentation
Diffstat (limited to 'src/fs/test_fs.c')
-rw-r--r-- | src/fs/test_fs.c | 140 |
1 files changed, 68 insertions, 72 deletions
diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 41a155407..b936c3199 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c | |||
@@ -37,9 +37,8 @@ makeName (unsigned int i) | |||
37 | { | 37 | { |
38 | char *fn; | 38 | char *fn; |
39 | 39 | ||
40 | fn = | 40 | fn = GNUNET_malloc (strlen ("/tmp/gnunet-basic_fsui_test/BASIC_FSUI_TEST") + |
41 | GNUNET_malloc (strlen ("/tmp/gnunet-basic_fsui_test/BASIC_FSUI_TEST") + | 41 | 14); |
42 | 14); | ||
43 | GNUNET_snprintf (fn, | 42 | GNUNET_snprintf (fn, |
44 | strlen ("/tmp/gnunet-basic_fsui_test/BASIC_FSUI_TEST") + | 43 | strlen ("/tmp/gnunet-basic_fsui_test/BASIC_FSUI_TEST") + |
45 | 14, "/tmp/gnunet-basic_fsui_test/BASIC_FSUI_TEST%u", i); | 44 | 14, "/tmp/gnunet-basic_fsui_test/BASIC_FSUI_TEST%u", i); |
@@ -61,39 +60,37 @@ eventCallback (void *cls, const GNUNET_FSUI_Event * event) | |||
61 | static char unused; | 60 | static char unused; |
62 | 61 | ||
63 | switch (event->type) | 62 | switch (event->type) |
64 | { | 63 | { |
65 | case GNUNET_FSUI_search_resumed: | 64 | case GNUNET_FSUI_search_resumed: |
66 | case GNUNET_FSUI_download_resumed: | 65 | case GNUNET_FSUI_download_resumed: |
67 | case GNUNET_FSUI_upload_resumed: | 66 | case GNUNET_FSUI_upload_resumed: |
68 | case GNUNET_FSUI_unindex_resumed: | 67 | case GNUNET_FSUI_unindex_resumed: |
69 | return &unused; | 68 | return &unused; |
70 | case GNUNET_FSUI_search_result: | 69 | case GNUNET_FSUI_search_result: |
71 | #if DEBUG_VERBOSE | 70 | #if DEBUG_VERBOSE |
72 | printf ("Received search result\n"); | 71 | printf ("Received search result\n"); |
73 | #endif | 72 | #endif |
74 | search_uri = | 73 | search_uri = GNUNET_ECRS_uri_duplicate (event->data.SearchResult.fi.uri); |
75 | GNUNET_ECRS_uri_duplicate (event->data.SearchResult.fi.uri); | 74 | search_meta = GNUNET_meta_data_duplicate (event->data.SearchResult.fi.meta); |
76 | search_meta = | 75 | break; |
77 | GNUNET_meta_data_duplicate (event->data.SearchResult.fi.meta); | 76 | case GNUNET_FSUI_upload_completed: |
78 | break; | ||
79 | case GNUNET_FSUI_upload_completed: | ||
80 | #if DEBUG_VERBOSE | 77 | #if DEBUG_VERBOSE |
81 | printf ("Upload complete.\n"); | 78 | printf ("Upload complete.\n"); |
82 | #endif | 79 | #endif |
83 | break; | 80 | break; |
84 | case GNUNET_FSUI_download_completed: | 81 | case GNUNET_FSUI_download_completed: |
85 | #if DEBUG_VERBOSE | 82 | #if DEBUG_VERBOSE |
86 | printf ("Download complete.\n"); | 83 | printf ("Download complete.\n"); |
87 | #endif | 84 | #endif |
88 | break; | 85 | break; |
89 | case GNUNET_FSUI_unindex_completed: | 86 | case GNUNET_FSUI_unindex_completed: |
90 | #if DEBUG_VERBOSE | 87 | #if DEBUG_VERBOSE |
91 | printf ("Unindex complete.\n"); | 88 | printf ("Unindex complete.\n"); |
92 | #endif | 89 | #endif |
93 | break; | 90 | break; |
94 | default: | 91 | default: |
95 | break; | 92 | break; |
96 | } | 93 | } |
97 | lastEvent = event->type; | 94 | lastEvent = event->type; |
98 | return NULL; | 95 | return NULL; |
99 | } | 96 | } |
@@ -109,6 +106,7 @@ main (int argc, char *argv[]) | |||
109 | int ok; | 106 | int ok; |
110 | struct GNUNET_ECRS_URI *uri; | 107 | struct GNUNET_ECRS_URI *uri; |
111 | char *filename = NULL; | 108 | char *filename = NULL; |
109 | |||
112 | char *keywords[] = { | 110 | char *keywords[] = { |
113 | "fsui_foo", | 111 | "fsui_foo", |
114 | "fsui_bar", | 112 | "fsui_bar", |
@@ -126,16 +124,15 @@ main (int argc, char *argv[]) | |||
126 | 124 | ||
127 | cfg = GNUNET_GC_create (); | 125 | cfg = GNUNET_GC_create (); |
128 | if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf")) | 126 | if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf")) |
129 | { | 127 | { |
130 | GNUNET_GC_free (cfg); | 128 | GNUNET_GC_free (cfg); |
131 | return -1; | 129 | return -1; |
132 | } | 130 | } |
133 | #if START_DAEMON | 131 | #if START_DAEMON |
134 | daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO); | 132 | daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO); |
135 | GNUNET_GE_ASSERT (NULL, daemon != NULL); | 133 | GNUNET_GE_ASSERT (NULL, daemon != NULL); |
136 | CHECK (GNUNET_OK == | 134 | CHECK (GNUNET_OK == |
137 | GNUNET_wait_for_daemon_running (NULL, cfg, | 135 | GNUNET_wait_for_daemon_running (NULL, cfg, 60 * GNUNET_CRON_SECONDS)); |
138 | 60 * GNUNET_CRON_SECONDS)); | ||
139 | #endif | 136 | #endif |
140 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ | 137 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ |
141 | ok = GNUNET_YES; | 138 | ok = GNUNET_YES; |
@@ -151,8 +148,8 @@ main (int argc, char *argv[]) | |||
151 | "foo bar test!", strlen ("foo bar test!"), "600"); | 148 | "foo bar test!", strlen ("foo bar test!"), "600"); |
152 | meta = GNUNET_meta_data_create (); | 149 | meta = GNUNET_meta_data_create (); |
153 | kuri = | 150 | kuri = |
154 | GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2, | 151 | GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2, |
155 | (const char **) keywords); | 152 | (const char **) keywords); |
156 | /* upload */ | 153 | /* upload */ |
157 | upload = GNUNET_FSUI_upload_start (ctx, filename, (GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan, NULL, 0, /* anonymity */ | 154 | upload = GNUNET_FSUI_upload_start (ctx, filename, (GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan, NULL, 0, /* anonymity */ |
158 | 0, /* priority */ | 155 | 0, /* priority */ |
@@ -166,13 +163,12 @@ main (int argc, char *argv[]) | |||
166 | GNUNET_meta_data_destroy (meta); | 163 | GNUNET_meta_data_destroy (meta); |
167 | prog = 0; | 164 | prog = 0; |
168 | while (lastEvent != GNUNET_FSUI_upload_completed) | 165 | while (lastEvent != GNUNET_FSUI_upload_completed) |
169 | { | 166 | { |
170 | prog++; | 167 | prog++; |
171 | CHECK (prog < | 168 | CHECK (prog < 10000) GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); |
172 | 10000) GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | 169 | if (GNUNET_shutdown_test () == GNUNET_YES) |
173 | if (GNUNET_shutdown_test () == GNUNET_YES) | 170 | break; |
174 | break; | 171 | } |
175 | } | ||
176 | 172 | ||
177 | /* search */ | 173 | /* search */ |
178 | GNUNET_snprintf (keyword, 40, "+%s +%s", keywords[0], keywords[1]); | 174 | GNUNET_snprintf (keyword, 40, "+%s +%s", keywords[0], keywords[1]); |
@@ -182,13 +178,13 @@ main (int argc, char *argv[]) | |||
182 | CHECK (search != NULL); | 178 | CHECK (search != NULL); |
183 | prog = 0; | 179 | prog = 0; |
184 | while (lastEvent != GNUNET_FSUI_search_result) | 180 | while (lastEvent != GNUNET_FSUI_search_result) |
185 | { | 181 | { |
186 | prog++; | 182 | prog++; |
187 | CHECK (prog < 10000); | 183 | CHECK (prog < 10000); |
188 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | 184 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); |
189 | if (GNUNET_shutdown_test () == GNUNET_YES) | 185 | if (GNUNET_shutdown_test () == GNUNET_YES) |
190 | break; | 186 | break; |
191 | } | 187 | } |
192 | GNUNET_FSUI_search_abort (search); | 188 | GNUNET_FSUI_search_abort (search); |
193 | GNUNET_FSUI_search_stop (search); | 189 | GNUNET_FSUI_search_stop (search); |
194 | 190 | ||
@@ -202,13 +198,13 @@ main (int argc, char *argv[]) | |||
202 | GNUNET_free (fn); | 198 | GNUNET_free (fn); |
203 | prog = 0; | 199 | prog = 0; |
204 | while (lastEvent != GNUNET_FSUI_download_completed) | 200 | while (lastEvent != GNUNET_FSUI_download_completed) |
205 | { | 201 | { |
206 | prog++; | 202 | prog++; |
207 | CHECK (prog < 10000); | 203 | CHECK (prog < 10000); |
208 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | 204 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); |
209 | if (GNUNET_shutdown_test () == GNUNET_YES) | 205 | if (GNUNET_shutdown_test () == GNUNET_YES) |
210 | break; | 206 | break; |
211 | } | 207 | } |
212 | GNUNET_FSUI_download_stop (download); | 208 | GNUNET_FSUI_download_stop (download); |
213 | download = NULL; | 209 | download = NULL; |
214 | GNUNET_ECRS_uri_destroy (search_uri); | 210 | GNUNET_ECRS_uri_destroy (search_uri); |
@@ -217,13 +213,13 @@ main (int argc, char *argv[]) | |||
217 | unindex = GNUNET_FSUI_unindex_start (ctx, filename); | 213 | unindex = GNUNET_FSUI_unindex_start (ctx, filename); |
218 | prog = 0; | 214 | prog = 0; |
219 | while (lastEvent != GNUNET_FSUI_unindex_completed) | 215 | while (lastEvent != GNUNET_FSUI_unindex_completed) |
220 | { | 216 | { |
221 | prog++; | 217 | prog++; |
222 | CHECK (prog < 10000); | 218 | CHECK (prog < 10000); |
223 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | 219 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); |
224 | if (GNUNET_shutdown_test () == GNUNET_YES) | 220 | if (GNUNET_shutdown_test () == GNUNET_YES) |
225 | break; | 221 | break; |
226 | } | 222 | } |
227 | if (lastEvent != GNUNET_FSUI_unindex_completed) | 223 | if (lastEvent != GNUNET_FSUI_unindex_completed) |
228 | GNUNET_FSUI_unindex_abort (unindex); | 224 | GNUNET_FSUI_unindex_abort (unindex); |
229 | GNUNET_FSUI_unindex_stop (unindex); | 225 | GNUNET_FSUI_unindex_stop (unindex); |
@@ -234,15 +230,15 @@ FAILURE: | |||
234 | if (ctx != NULL) | 230 | if (ctx != NULL) |
235 | GNUNET_FSUI_stop (ctx); | 231 | GNUNET_FSUI_stop (ctx); |
236 | if (filename != NULL) | 232 | if (filename != NULL) |
237 | { | 233 | { |
238 | UNLINK (filename); | 234 | UNLINK (filename); |
239 | GNUNET_free (filename); | 235 | GNUNET_free (filename); |
240 | } | 236 | } |
241 | if (download != NULL) | 237 | if (download != NULL) |
242 | { | 238 | { |
243 | GNUNET_FSUI_download_abort (download); | 239 | GNUNET_FSUI_download_abort (download); |
244 | GNUNET_FSUI_download_stop (download); | 240 | GNUNET_FSUI_download_stop (download); |
245 | } | 241 | } |
246 | filename = makeName (43); | 242 | filename = makeName (43); |
247 | /* TODO: verify file 'filename(42)' == file 'filename(43)' */ | 243 | /* TODO: verify file 'filename(42)' == file 'filename(43)' */ |
248 | UNLINK (filename); | 244 | UNLINK (filename); |