From 502af2167f7c218366666ca4944bd7cc54b5b19a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 15 Aug 2011 21:46:35 +0000 Subject: indentation --- src/fs/test_fs_list_indexed.c | 280 ++++++++++++++++++++---------------------- 1 file changed, 134 insertions(+), 146 deletions(-) (limited to 'src/fs/test_fs_list_indexed.c') diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index b46ebf52d..e3330f3ba 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -49,7 +49,7 @@ /** * How long should our test-content live? - */ + */ #define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15) struct PeerContext @@ -75,8 +75,7 @@ static char *fn2; static int err; 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; @@ -90,101 +89,96 @@ abort_publish_task (void *cls, static void -list_indexed_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +list_indexed_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_SCHEDULER_add_continuation (&abort_publish_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } static void * -progress_cb (void *cls, - const struct GNUNET_FS_ProgressInfo *event) +progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) { void *ret; ret = NULL; switch (event->status) - { - case GNUNET_FS_STATUS_PUBLISH_COMPLETED: - ret = event->value.publish.cctx; - printf ("Publish complete, %llu kbps.\n", - (unsigned long long) (FILESIZE * 1000 / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024)); - if (0 == strcmp ("list_indexed-context-dir", - event->value.publish.cctx)) - GNUNET_SCHEDULER_add_continuation (&list_indexed_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - - break; - case GNUNET_FS_STATUS_PUBLISH_PROGRESS: - ret = event->value.publish.cctx; - GNUNET_assert (publish == event->value.publish.pc); + { + case GNUNET_FS_STATUS_PUBLISH_COMPLETED: + ret = event->value.publish.cctx; + printf ("Publish complete, %llu kbps.\n", + (unsigned long long) (FILESIZE * 1000 / + (1 + + GNUNET_TIME_absolute_get_duration + (start).rel_value) / 1024)); + if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) + GNUNET_SCHEDULER_add_continuation (&list_indexed_task, + NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + + break; + case GNUNET_FS_STATUS_PUBLISH_PROGRESS: + ret = event->value.publish.cctx; + GNUNET_assert (publish == event->value.publish.pc); #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); + 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_ERROR: - ret = event->value.publish.cctx; - fprintf (stderr, - "Error publishing file: %s\n", - event->value.publish.specifics.error.message); - err = 1; - if (0 == strcmp ("list_indexed-context-dir", - event->value.publish.cctx)) - GNUNET_SCHEDULER_add_continuation (&abort_publish_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - break; - case GNUNET_FS_STATUS_PUBLISH_START: - ret = event->value.publish.cctx; - if (0 == strcmp ("list_indexed-context1", - event->value.publish.cctx)) - { - GNUNET_assert (0 == strcmp ("list_indexed-context-dir", - 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); - } - else if (0 == strcmp ("list_indexed-context2", - event->value.publish.cctx)) - { - GNUNET_assert (0 == strcmp ("list_indexed-context-dir", - event->value.publish.pctx)); - GNUNET_assert (FILESIZE == event->value.publish.size); - GNUNET_assert (0 == event->value.publish.completed); - GNUNET_assert (2 == event->value.publish.anonymity); - } - else if (0 == strcmp ("list_indexed-context-dir", - event->value.publish.cctx)) - { - GNUNET_assert (0 == event->value.publish.completed); - GNUNET_assert (3 == event->value.publish.anonymity); - } - else - GNUNET_assert (0); - break; - case GNUNET_FS_STATUS_PUBLISH_STOPPED: - if (0 == strcmp ("list_indexed-context-dir", - event->value.publish.cctx)) - { - GNUNET_assert (publish == event->value.publish.pc); - publish = NULL; - } - break; - default: - printf ("Unexpected event: %d\n", - event->status); - break; + break; + case GNUNET_FS_STATUS_PUBLISH_ERROR: + ret = event->value.publish.cctx; + fprintf (stderr, + "Error publishing file: %s\n", + event->value.publish.specifics.error.message); + err = 1; + if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) + GNUNET_SCHEDULER_add_continuation (&abort_publish_task, + NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); + break; + case GNUNET_FS_STATUS_PUBLISH_START: + ret = event->value.publish.cctx; + if (0 == strcmp ("list_indexed-context1", event->value.publish.cctx)) + { + GNUNET_assert (0 == strcmp ("list_indexed-context-dir", + 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); } + else if (0 == strcmp ("list_indexed-context2", event->value.publish.cctx)) + { + GNUNET_assert (0 == strcmp ("list_indexed-context-dir", + event->value.publish.pctx)); + GNUNET_assert (FILESIZE == event->value.publish.size); + GNUNET_assert (0 == event->value.publish.completed); + GNUNET_assert (2 == event->value.publish.anonymity); + } + else if (0 == strcmp ("list_indexed-context-dir", + event->value.publish.cctx)) + { + GNUNET_assert (0 == event->value.publish.completed); + GNUNET_assert (3 == event->value.publish.anonymity); + } + else + GNUNET_assert (0); + break; + case GNUNET_FS_STATUS_PUBLISH_STOPPED: + if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) + { + GNUNET_assert (publish == event->value.publish.pc); + publish = NULL; + } + break; + default: + printf ("Unexpected event: %d\n", event->status); + break; + } return ret; } @@ -195,11 +189,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)); } @@ -210,16 +204,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); } @@ -228,8 +223,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", @@ -246,21 +240,20 @@ run (void *cls, setup_peer (&p1, "test_fs_list_indexed_data.conf"); fs = GNUNET_FS_start (cfg, - "test-fs-list_indexed", - &progress_cb, - NULL, - GNUNET_FS_FLAGS_NONE, - GNUNET_FS_OPTIONS_END); - GNUNET_assert (NULL != fs); + "test-fs-list_indexed", + &progress_cb, + NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); + GNUNET_assert (NULL != fs); fn1 = GNUNET_DISK_mktemp ("gnunet-list_indexed-test-dst"); buf = GNUNET_malloc (FILESIZE); for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); GNUNET_assert (FILESIZE == - GNUNET_DISK_fn_write (fn1, - buf, - FILESIZE, - GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)); + GNUNET_DISK_fn_write (fn1, + buf, + FILESIZE, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE)); GNUNET_free (buf); fn2 = GNUNET_DISK_mktemp ("gnunet-list_indexed-test-dst"); @@ -268,10 +261,11 @@ run (void *cls, for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); GNUNET_assert (FILESIZE == - GNUNET_DISK_fn_write (fn2, - buf, - FILESIZE, - GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)); + GNUNET_DISK_fn_write (fn2, + buf, + FILESIZE, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE)); GNUNET_free (buf); meta = GNUNET_CONTAINER_meta_data_create (); @@ -279,30 +273,24 @@ run (void *cls, bo.content_priority = 42; bo.anonymity_level = 1; bo.replication_level = 0; - bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); + bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); fi1 = GNUNET_FS_file_information_create_from_file (fs, - "list_indexed-context1", - fn1, - kuri, - meta, - GNUNET_YES, - &bo); + "list_indexed-context1", + fn1, + kuri, + meta, GNUNET_YES, &bo); GNUNET_assert (NULL != fi1); bo.anonymity_level = 2; fi2 = GNUNET_FS_file_information_create_from_file (fs, - "list_indexed-context2", - fn2, - kuri, - meta, - GNUNET_YES, - &bo); + "list_indexed-context2", + fn2, + kuri, + meta, GNUNET_YES, &bo); GNUNET_assert (NULL != fi2); bo.anonymity_level = 3; fidir = GNUNET_FS_file_information_create_empty_directory (fs, - "list_indexed-context-dir", - kuri, - meta, - &bo); + "list_indexed-context-dir", + kuri, meta, &bo); GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1)); GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2)); GNUNET_FS_uri_destroy (kuri); @@ -310,9 +298,9 @@ run (void *cls, GNUNET_assert (NULL != fidir); start = GNUNET_TIME_absolute_get (); publish = GNUNET_FS_publish_start (fs, - fidir, - NULL, NULL, NULL, - GNUNET_FS_PUBLISH_OPTION_NONE); + fidir, + NULL, NULL, NULL, + GNUNET_FS_PUBLISH_OPTION_NONE); GNUNET_assert (publish != NULL); } @@ -320,7 +308,7 @@ run (void *cls, int main (int argc, char *argv[]) { - char *const argvx[] = { + char *const argvx[] = { "test-fs-list_indexed", "-c", "test_fs_list_indexed_data.conf", @@ -333,28 +321,28 @@ main (int argc, char *argv[]) GNUNET_GETOPT_OPTION_END }; - GNUNET_log_setup ("test_fs_list_indexed", + GNUNET_log_setup ("test_fs_list_indexed", #if VERBOSE - "DEBUG", + "DEBUG", #else - "WARNING", + "WARNING", #endif - NULL); + NULL); GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, "test-fs-list_indexed", - "nohelp", options, &run, NULL); + "nohelp", options, &run, NULL); stop_arm (&p1); GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list-indexed/"); if (fn1 != NULL) - { - GNUNET_DISK_directory_remove (fn1); - GNUNET_free (fn1); - } + { + GNUNET_DISK_directory_remove (fn1); + GNUNET_free (fn1); + } if (fn2 != NULL) - { - GNUNET_DISK_directory_remove (fn2); - GNUNET_free (fn2); - } + { + GNUNET_DISK_directory_remove (fn2); + GNUNET_free (fn2); + } return err; } -- cgit v1.2.3