diff options
Diffstat (limited to 'src/fs/test_fs_search.c')
-rw-r--r-- | src/fs/test_fs_search.c | 234 |
1 files changed, 111 insertions, 123 deletions
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index a1f3208ef4..878624c73d 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -45,13 +45,13 @@ /** * How long should our test-content live? - */ + */ #define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15) struct PeerContext { struct GNUNET_CONFIGURATION_Handle *cfg; - struct GNUNET_PeerIdentity id; + struct GNUNET_PeerIdentity id; #if START_ARM struct GNUNET_OS_Process *arm_proc; #endif @@ -69,8 +69,7 @@ static struct GNUNET_FS_PublishContext *publish; static void -abort_publish_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_FS_publish_stop (publish); publish = NULL; @@ -78,8 +77,7 @@ abort_publish_task (void *cls, static void -abort_search_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (search != NULL) GNUNET_FS_search_stop (search); @@ -88,94 +86,90 @@ abort_search_task (void *cls, static void * -progress_cb (void *cls, - const struct GNUNET_FS_ProgressInfo *event) -{ +progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) +{ const char *keywords[] = { "down_foo" }; struct GNUNET_FS_Uri *kuri; switch (event->status) - { - case GNUNET_FS_STATUS_PUBLISH_PROGRESS: + { + case GNUNET_FS_STATUS_PUBLISH_PROGRESS: #if VERBOSE - printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", - (unsigned long long) event->value.publish.completed, - (unsigned long long) event->value.publish.size, - event->value.publish.specifics.progress.depth, - (unsigned long long) event->value.publish.specifics.progress.offset); -#endif - break; - case GNUNET_FS_STATUS_PUBLISH_COMPLETED: - kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords); - start = GNUNET_TIME_absolute_get (); - search = GNUNET_FS_search_start (fs, - kuri, - 1, - GNUNET_FS_SEARCH_OPTION_NONE, - "search"); - GNUNET_FS_uri_destroy (kuri); - GNUNET_assert (search != NULL); - break; - case GNUNET_FS_STATUS_SEARCH_RESULT: + printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", + (unsigned long long) event->value.publish.completed, + (unsigned long long) event->value.publish.size, + event->value.publish.specifics.progress.depth, + (unsigned long long) event->value.publish.specifics. + progress.offset); +#endif + break; + case GNUNET_FS_STATUS_PUBLISH_COMPLETED: + kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords); + start = GNUNET_TIME_absolute_get (); + search = GNUNET_FS_search_start (fs, + kuri, + 1, GNUNET_FS_SEARCH_OPTION_NONE, "search"); + GNUNET_FS_uri_destroy (kuri); + GNUNET_assert (search != NULL); + break; + case GNUNET_FS_STATUS_SEARCH_RESULT: #if VERBOSE - printf ("Search complete.\n"); + printf ("Search complete.\n"); #endif - GNUNET_SCHEDULER_add_continuation (&abort_search_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - break; - case GNUNET_FS_STATUS_PUBLISH_ERROR: - fprintf (stderr, - "Error publishing file: %s\n", - event->value.publish.specifics.error.message); - GNUNET_break (0); - GNUNET_SCHEDULER_add_continuation (&abort_publish_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - break; - case GNUNET_FS_STATUS_SEARCH_ERROR: - fprintf (stderr, - "Error searching file: %s\n", - event->value.search.specifics.error.message); - GNUNET_SCHEDULER_add_continuation (&abort_search_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - break; - case GNUNET_FS_STATUS_PUBLISH_START: - GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx)); - GNUNET_assert (NULL == event->value.publish.pctx); - GNUNET_assert (FILESIZE == event->value.publish.size); - GNUNET_assert (0 == event->value.publish.completed); - GNUNET_assert (1 == event->value.publish.anonymity); - break; - case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.pc); - GNUNET_assert (FILESIZE == event->value.publish.size); - GNUNET_assert (1 == event->value.publish.anonymity); - GNUNET_FS_stop (fs); - fs = NULL; - break; - case GNUNET_FS_STATUS_SEARCH_START: - GNUNET_assert (search == NULL); - GNUNET_assert (0 == strcmp ("search", event->value.search.cctx)); - GNUNET_assert (1 == event->value.search.anonymity); - break; - case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED: - break; - case GNUNET_FS_STATUS_SEARCH_STOPPED: - GNUNET_assert (search == event->value.search.sc); - GNUNET_SCHEDULER_add_continuation (&abort_publish_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - break; - default: - fprintf (stderr, - "Unexpected event: %d\n", - event->status); - break; - } + GNUNET_SCHEDULER_add_continuation (&abort_search_task, + NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + break; + case GNUNET_FS_STATUS_PUBLISH_ERROR: + fprintf (stderr, + "Error publishing file: %s\n", + event->value.publish.specifics.error.message); + GNUNET_break (0); + GNUNET_SCHEDULER_add_continuation (&abort_publish_task, + NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + break; + case GNUNET_FS_STATUS_SEARCH_ERROR: + fprintf (stderr, + "Error searching file: %s\n", + event->value.search.specifics.error.message); + GNUNET_SCHEDULER_add_continuation (&abort_search_task, + NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + break; + case GNUNET_FS_STATUS_PUBLISH_START: + GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx)); + GNUNET_assert (NULL == event->value.publish.pctx); + GNUNET_assert (FILESIZE == event->value.publish.size); + GNUNET_assert (0 == event->value.publish.completed); + GNUNET_assert (1 == event->value.publish.anonymity); + break; + case GNUNET_FS_STATUS_PUBLISH_STOPPED: + GNUNET_assert (publish == event->value.publish.pc); + GNUNET_assert (FILESIZE == event->value.publish.size); + GNUNET_assert (1 == event->value.publish.anonymity); + GNUNET_FS_stop (fs); + fs = NULL; + break; + case GNUNET_FS_STATUS_SEARCH_START: + GNUNET_assert (search == NULL); + GNUNET_assert (0 == strcmp ("search", event->value.search.cctx)); + GNUNET_assert (1 == event->value.search.anonymity); + break; + case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED: + break; + case GNUNET_FS_STATUS_SEARCH_STOPPED: + GNUNET_assert (search == event->value.search.sc); + GNUNET_SCHEDULER_add_continuation (&abort_publish_task, + NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + break; + default: + fprintf (stderr, "Unexpected event: %d\n", event->status); + break; + } return NULL; } @@ -186,11 +180,11 @@ setup_peer (struct PeerContext *p, const char *cfgname) p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", + "gnunet-service-arm", #if VERBOSE - "-L", "DEBUG", + "-L", "DEBUG", #endif - "-c", cfgname, NULL); + "-c", cfgname, NULL); #endif GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); } @@ -201,16 +195,17 @@ stop_arm (struct PeerContext *p) { #if START_ARM if (NULL != p->arm_proc) - { - if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); - p->arm_proc = NULL; - } + { + if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM process %u stopped\n", + GNUNET_OS_process_get_pid (p->arm_proc)); + GNUNET_OS_process_close (p->arm_proc); + p->arm_proc = NULL; + } #endif GNUNET_CONFIGURATION_destroy (p->cfg); } @@ -219,8 +214,7 @@ stop_arm (struct PeerContext *p) static void run (void *cls, char *const *args, - const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { const char *keywords[] = { "down_foo", @@ -235,12 +229,10 @@ run (void *cls, setup_peer (&p1, "test_fs_search_data.conf"); fs = GNUNET_FS_start (cfg, - "test-fs-search", - &progress_cb, - NULL, - GNUNET_FS_FLAGS_NONE, - GNUNET_FS_OPTIONS_END); - GNUNET_assert (NULL != fs); + "test-fs-search", + &progress_cb, + NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); + GNUNET_assert (NULL != fs); buf = GNUNET_malloc (FILESIZE); for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); @@ -251,21 +243,18 @@ run (void *cls, bo.replication_level = 0; bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); fi = GNUNET_FS_file_information_create_from_data (fs, - "publish-context", - FILESIZE, - buf, - kuri, - meta, - GNUNET_NO, - &bo); + "publish-context", + FILESIZE, + buf, + kuri, meta, GNUNET_NO, &bo); GNUNET_FS_uri_destroy (kuri); GNUNET_CONTAINER_meta_data_destroy (meta); GNUNET_assert (NULL != fi); start = GNUNET_TIME_absolute_get (); publish = GNUNET_FS_publish_start (fs, - fi, - NULL, NULL, NULL, - GNUNET_FS_PUBLISH_OPTION_NONE); + fi, + NULL, NULL, NULL, + GNUNET_FS_PUBLISH_OPTION_NONE); GNUNET_assert (publish != NULL); } @@ -273,7 +262,7 @@ run (void *cls, int main (int argc, char *argv[]) { - char *const argvx[] = { + char *const argvx[] = { "test-fs-search", "-c", "test_fs_search_data.conf", @@ -286,16 +275,15 @@ main (int argc, char *argv[]) GNUNET_GETOPT_OPTION_END }; - GNUNET_log_setup ("test_fs_search", + GNUNET_log_setup ("test_fs_search", #if VERBOSE - "DEBUG", + "DEBUG", #else - "WARNING", + "WARNING", #endif - NULL); + NULL); GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, - argvx, "test-fs-search", - "nohelp", options, &run, NULL); + argvx, "test-fs-search", "nohelp", options, &run, NULL); stop_arm (&p1); GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/"); return 0; |