diff options
Diffstat (limited to 'src/fs/test_fs_search_ranking.c')
-rw-r--r-- | src/fs/test_fs_search_ranking.c | 153 |
1 files changed, 75 insertions, 78 deletions
diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c index 06c37dfc2..b19ff97bf 100644 --- a/src/fs/test_fs_search_ranking.c +++ b/src/fs/test_fs_search_ranking.c | |||
@@ -37,8 +37,7 @@ makeName (unsigned int i) | |||
37 | { | 37 | { |
38 | char *fn; | 38 | char *fn; |
39 | 39 | ||
40 | fn = | 40 | fn = GNUNET_malloc (strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14); |
41 | GNUNET_malloc (strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14); | ||
42 | GNUNET_snprintf (fn, | 41 | GNUNET_snprintf (fn, |
43 | strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14, | 42 | strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 14, |
44 | "/tmp/gnunet-fsui-searchranktest/FSUITEST%u", i); | 43 | "/tmp/gnunet-fsui-searchranktest/FSUITEST%u", i); |
@@ -64,57 +63,57 @@ eventCallback (void *cls, const GNUNET_FSUI_Event * event) | |||
64 | static char unused; | 63 | static char unused; |
65 | 64 | ||
66 | switch (event->type) | 65 | switch (event->type) |
67 | { | 66 | { |
68 | case GNUNET_FSUI_search_resumed: | 67 | case GNUNET_FSUI_search_resumed: |
69 | search = event->data.SearchResumed.sc.pos; | 68 | search = event->data.SearchResumed.sc.pos; |
70 | break; | 69 | break; |
71 | case GNUNET_FSUI_search_suspended: | 70 | case GNUNET_FSUI_search_suspended: |
72 | search = NULL; | 71 | search = NULL; |
73 | break; | 72 | break; |
74 | case GNUNET_FSUI_search_update: | 73 | case GNUNET_FSUI_search_update: |
75 | availability = event->data.SearchUpdate.availability_rank; | 74 | availability = event->data.SearchUpdate.availability_rank; |
76 | rank = event->data.SearchUpdate.applicability_rank; | 75 | rank = event->data.SearchUpdate.applicability_rank; |
77 | break; | 76 | break; |
78 | case GNUNET_FSUI_search_paused: | 77 | case GNUNET_FSUI_search_paused: |
79 | case GNUNET_FSUI_search_restarted: | 78 | case GNUNET_FSUI_search_restarted: |
80 | break; | 79 | break; |
81 | case GNUNET_FSUI_download_resumed: | 80 | case GNUNET_FSUI_download_resumed: |
82 | case GNUNET_FSUI_upload_resumed: | 81 | case GNUNET_FSUI_upload_resumed: |
83 | case GNUNET_FSUI_unindex_resumed: | 82 | case GNUNET_FSUI_unindex_resumed: |
84 | return &unused; | 83 | return &unused; |
85 | case GNUNET_FSUI_search_result: | 84 | case GNUNET_FSUI_search_result: |
86 | #if CHECK_VERBOSE | 85 | #if CHECK_VERBOSE |
87 | printf ("Received search result\n"); | 86 | printf ("Received search result\n"); |
88 | #endif | 87 | #endif |
89 | uri = GNUNET_ECRS_uri_duplicate (event->data.SearchResult.fi.uri); | 88 | uri = GNUNET_ECRS_uri_duplicate (event->data.SearchResult.fi.uri); |
90 | break; | 89 | break; |
91 | case GNUNET_FSUI_upload_completed: | 90 | case GNUNET_FSUI_upload_completed: |
92 | #if CHECK_VERBOSE | 91 | #if CHECK_VERBOSE |
93 | printf ("Upload complete.\n"); | 92 | printf ("Upload complete.\n"); |
94 | #endif | 93 | #endif |
95 | break; | 94 | break; |
96 | case GNUNET_FSUI_download_completed: | 95 | case GNUNET_FSUI_download_completed: |
97 | #if CHECK_VERBOSE | 96 | #if CHECK_VERBOSE |
98 | printf ("Download complete.\n"); | 97 | printf ("Download complete.\n"); |
99 | #endif | 98 | #endif |
100 | break; | 99 | break; |
101 | case GNUNET_FSUI_unindex_completed: | 100 | case GNUNET_FSUI_unindex_completed: |
102 | #if CHECK_VERBOSE | 101 | #if CHECK_VERBOSE |
103 | printf ("Unindex complete.\n"); | 102 | printf ("Unindex complete.\n"); |
104 | #endif | 103 | #endif |
105 | break; | 104 | break; |
106 | case GNUNET_FSUI_upload_error: | 105 | case GNUNET_FSUI_upload_error: |
107 | printf ("Upload error.\n"); | 106 | printf ("Upload error.\n"); |
108 | break; | 107 | break; |
109 | case GNUNET_FSUI_download_error: | 108 | case GNUNET_FSUI_download_error: |
110 | printf ("Download error.\n"); | 109 | printf ("Download error.\n"); |
111 | break; | 110 | break; |
112 | case GNUNET_FSUI_unindex_error: | 111 | case GNUNET_FSUI_unindex_error: |
113 | printf ("Unindex error.\n"); | 112 | printf ("Unindex error.\n"); |
114 | break; | 113 | break; |
115 | default: | 114 | default: |
116 | break; | 115 | break; |
117 | } | 116 | } |
118 | if (lastEvent != waitForEvent) | 117 | if (lastEvent != waitForEvent) |
119 | lastEvent = event->type; | 118 | lastEvent = event->type; |
120 | return NULL; | 119 | return NULL; |
@@ -130,6 +129,7 @@ main (int argc, char *argv[]) | |||
130 | #endif | 129 | #endif |
131 | int ok; | 130 | int ok; |
132 | char *fn = NULL; | 131 | char *fn = NULL; |
132 | |||
133 | char *keywords[] = { | 133 | char *keywords[] = { |
134 | "search_foo", | 134 | "search_foo", |
135 | "search_bar", | 135 | "search_bar", |
@@ -146,17 +146,16 @@ main (int argc, char *argv[]) | |||
146 | ok = GNUNET_YES; | 146 | ok = GNUNET_YES; |
147 | cfg = GNUNET_GC_create (); | 147 | cfg = GNUNET_GC_create (); |
148 | if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf")) | 148 | if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf")) |
149 | { | 149 | { |
150 | GNUNET_GC_free (cfg); | 150 | GNUNET_GC_free (cfg); |
151 | return -1; | 151 | return -1; |
152 | } | 152 | } |
153 | #if START_DAEMON | 153 | #if START_DAEMON |
154 | GNUNET_disk_directory_remove (NULL, "/tmp/gnunet-fsui-searchranktest/"); | 154 | GNUNET_disk_directory_remove (NULL, "/tmp/gnunet-fsui-searchranktest/"); |
155 | daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO); | 155 | daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO); |
156 | GNUNET_GE_ASSERT (NULL, daemon != NULL); | 156 | GNUNET_GE_ASSERT (NULL, daemon != NULL); |
157 | CHECK (GNUNET_OK == | 157 | CHECK (GNUNET_OK == |
158 | GNUNET_wait_for_daemon_running (NULL, cfg, | 158 | GNUNET_wait_for_daemon_running (NULL, cfg, 30 * GNUNET_CRON_SECONDS)); |
159 | 30 * GNUNET_CRON_SECONDS)); | ||
160 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ | 159 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ |
161 | /* ACTUAL TEST CODE */ | 160 | /* ACTUAL TEST CODE */ |
162 | #endif | 161 | #endif |
@@ -167,21 +166,20 @@ main (int argc, char *argv[]) | |||
167 | /* upload */ | 166 | /* upload */ |
168 | fn = makeName (42); | 167 | fn = makeName (42); |
169 | GNUNET_disk_file_write (NULL, | 168 | GNUNET_disk_file_write (NULL, |
170 | fn, "foo bar test!", strlen ("foo bar test!"), | 169 | fn, "foo bar test!", strlen ("foo bar test!"), "600"); |
171 | "600"); | ||
172 | meta = GNUNET_meta_data_create (); | 170 | meta = GNUNET_meta_data_create (); |
173 | kuri = | 171 | kuri = |
174 | GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2, | 172 | GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2, |
175 | (const char **) keywords); | 173 | (const char **) keywords); |
176 | waitForEvent = GNUNET_FSUI_upload_completed; | 174 | waitForEvent = GNUNET_FSUI_upload_completed; |
177 | upload = | 175 | upload = |
178 | GNUNET_FSUI_upload_start (ctx, | 176 | GNUNET_FSUI_upload_start (ctx, |
179 | fn, | 177 | fn, |
180 | (GNUNET_FSUI_DirectoryScanCallback) & | 178 | (GNUNET_FSUI_DirectoryScanCallback) & |
181 | GNUNET_disk_directory_scan, NULL, 0, 0, | 179 | GNUNET_disk_directory_scan, NULL, 0, 0, |
182 | GNUNET_YES, GNUNET_NO, GNUNET_NO, | 180 | GNUNET_YES, GNUNET_NO, GNUNET_NO, |
183 | GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, | 181 | GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, |
184 | meta, kuri, kuri); | 182 | meta, kuri, kuri); |
185 | CHECK (NULL != upload); | 183 | CHECK (NULL != upload); |
186 | GNUNET_free (fn); | 184 | GNUNET_free (fn); |
187 | fn = NULL; | 185 | fn = NULL; |
@@ -189,19 +187,18 @@ main (int argc, char *argv[]) | |||
189 | GNUNET_meta_data_destroy (meta); | 187 | GNUNET_meta_data_destroy (meta); |
190 | prog = 0; | 188 | prog = 0; |
191 | while (lastEvent != GNUNET_FSUI_upload_completed) | 189 | while (lastEvent != GNUNET_FSUI_upload_completed) |
190 | { | ||
191 | prog++; | ||
192 | if (prog == 10000) | ||
192 | { | 193 | { |
193 | prog++; | 194 | fprintf (stderr, |
194 | if (prog == 10000) | 195 | "Upload failed to complete -- last event: %u\n", lastEvent); |
195 | { | ||
196 | fprintf (stderr, | ||
197 | "Upload failed to complete -- last event: %u\n", | ||
198 | lastEvent); | ||
199 | } | ||
200 | CHECK (prog < 10000); | ||
201 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | ||
202 | if (GNUNET_shutdown_test () == GNUNET_YES) | ||
203 | break; | ||
204 | } | 196 | } |
197 | CHECK (prog < 10000); | ||
198 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | ||
199 | if (GNUNET_shutdown_test () == GNUNET_YES) | ||
200 | break; | ||
201 | } | ||
205 | GNUNET_FSUI_upload_stop (upload); | 202 | GNUNET_FSUI_upload_stop (upload); |
206 | 203 | ||
207 | /* search */ | 204 | /* search */ |
@@ -217,11 +214,11 @@ main (int argc, char *argv[]) | |||
217 | while ((uri == NULL) && | 214 | while ((uri == NULL) && |
218 | (availability < 3) && | 215 | (availability < 3) && |
219 | (rank != 2) && (GNUNET_shutdown_test () != GNUNET_YES)) | 216 | (rank != 2) && (GNUNET_shutdown_test () != GNUNET_YES)) |
220 | { | 217 | { |
221 | prog++; | 218 | prog++; |
222 | CHECK (prog < 10000); | 219 | CHECK (prog < 10000); |
223 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); | 220 | GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); |
224 | } | 221 | } |
225 | GNUNET_FSUI_search_abort (search); | 222 | GNUNET_FSUI_search_abort (search); |
226 | GNUNET_FSUI_search_stop (search); | 223 | GNUNET_FSUI_search_stop (search); |
227 | CHECK (uri != NULL); | 224 | CHECK (uri != NULL); |