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_gnunet_service_fs_migration.c | 178 ++++++++++++------------------ 1 file changed, 73 insertions(+), 105 deletions(-) (limited to 'src/fs/test_gnunet_service_fs_migration.c') diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 092cedfc2..9a209521f 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c @@ -53,172 +53,140 @@ static int ok; static struct GNUNET_TIME_Absolute start_time; static void -do_stop (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_TIME_Relative del; char *fancy; - GNUNET_FS_TEST_daemons_stop (2, - daemons); + GNUNET_FS_TEST_daemons_stop (2, daemons); if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) - { - del = GNUNET_TIME_absolute_get_duration (start_time); - if (del.rel_value == 0) - del.rel_value = 1; - fancy = GNUNET_STRINGS_byte_size_fancy (((unsigned long long)FILESIZE) * 1000LL / del.rel_value); - fprintf (stdout, - "Download speed was %s/s\n", - fancy); - GNUNET_free (fancy); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Finished download, shutting down\n", - (unsigned long long) FILESIZE); - } + { + del = GNUNET_TIME_absolute_get_duration (start_time); + if (del.rel_value == 0) + del.rel_value = 1; + fancy = + GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) * + 1000LL / del.rel_value); + fprintf (stdout, "Download speed was %s/s\n", fancy); + GNUNET_free (fancy); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished download, shutting down\n", + (unsigned long long) FILESIZE); + } else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Timeout during download, shutting down with error\n"); - ok = 1; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Timeout during download, shutting down with error\n"); + ok = 1; + } } static void -do_download (void *cls, - const char *emsg) +do_download (void *cls, const char *emsg) { struct GNUNET_FS_Uri *uri = cls; if (emsg != NULL) - { - GNUNET_FS_TEST_daemons_stop (2, - daemons); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Failed to stop source daemon: %s\n", - emsg); - GNUNET_FS_uri_destroy (uri); - ok = 1; - return; - } + { + GNUNET_FS_TEST_daemons_stop (2, daemons); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Failed to stop source daemon: %s\n", emsg); + GNUNET_FS_uri_destroy (uri); + ok = 1; + return; + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Downloading %llu bytes\n", - (unsigned long long) FILESIZE); + "Downloading %llu bytes\n", (unsigned long long) FILESIZE); start_time = GNUNET_TIME_absolute_get (); GNUNET_FS_TEST_download (daemons[0], - TIMEOUT, - 1, SEED, uri, - VERBOSE, - &do_stop, NULL); + TIMEOUT, 1, SEED, uri, VERBOSE, &do_stop, NULL); GNUNET_FS_uri_destroy (uri); } static void -stop_source_peer (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_FS_Uri *uri = cls; struct GNUNET_TESTING_PeerGroup *pg; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Stopping source peer\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n"); pg = GNUNET_FS_TEST_get_group (daemons); - GNUNET_TESTING_daemons_vary (pg, 1, GNUNET_NO, TIMEOUT, - &do_download, - uri); + GNUNET_TESTING_daemons_vary (pg, 1, GNUNET_NO, TIMEOUT, &do_download, uri); } static void -do_wait (void *cls, - const struct GNUNET_FS_Uri *uri) +do_wait (void *cls, const struct GNUNET_FS_Uri *uri) { struct GNUNET_FS_Uri *d; if (NULL == uri) - { - GNUNET_FS_TEST_daemons_stop (2, - daemons); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Timeout during upload attempt, shutting down with error\n"); - ok = 1; - return; - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Waiting to allow content to migrate\n"); + { + GNUNET_FS_TEST_daemons_stop (2, daemons); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Timeout during upload attempt, shutting down with error\n"); + ok = 1; + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting to allow content to migrate\n"); d = GNUNET_FS_uri_dup (uri); - (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, - &stop_source_peer, - d); + (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, &stop_source_peer, d); } static void -do_publish (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) - { - GNUNET_FS_TEST_daemons_stop (2, - daemons); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Timeout during connect attempt, shutting down with error\n"); - ok = 1; - return; - } + { + GNUNET_FS_TEST_daemons_stop (2, daemons); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Timeout during connect attempt, shutting down with error\n"); + ok = 1; + return; + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Publishing %llu bytes\n", - (unsigned long long) FILESIZE); + "Publishing %llu bytes\n", (unsigned long long) FILESIZE); GNUNET_FS_TEST_publish (daemons[1], - TIMEOUT, - 1, GNUNET_NO, FILESIZE, SEED, - VERBOSE, - &do_wait, NULL); + TIMEOUT, + 1, GNUNET_NO, FILESIZE, SEED, + VERBOSE, &do_wait, NULL); } static void -do_connect (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) - { - fprintf (stderr, - "Daemons failed to start!\n"); - GNUNET_break (0); - ok = 1; - return; - } + { + fprintf (stderr, "Daemons failed to start!\n"); + GNUNET_break (0); + ok = 1; + return; + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Daemons started, will now try to connect them\n"); + "Daemons started, will now try to connect them\n"); GNUNET_FS_TEST_daemons_connect (daemons[0], - daemons[1], - TIMEOUT, - &do_publish, - NULL); + daemons[1], TIMEOUT, &do_publish, NULL); } 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) { GNUNET_FS_TEST_daemons_start ("test_gnunet_service_fs_migration_data.conf", - TIMEOUT, - 2, - daemons, - &do_connect, - NULL); + TIMEOUT, 2, daemons, &do_connect, NULL); } int main (int argc, char *argv[]) { - char *const argvx[] = { + char *const argvx[] = { "test-gnunet-service-fs-migration", "-c", "fs_test_lib_data.conf", @@ -232,16 +200,16 @@ main (int argc, char *argv[]) }; GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/"); - GNUNET_log_setup ("test_gnunet_service_fs_migration", + GNUNET_log_setup ("test_gnunet_service_fs_migration", #if VERBOSE - "DEBUG", + "DEBUG", #else - "WARNING", + "WARNING", #endif - NULL); + NULL); GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, "test-gnunet-service-fs-migration", - "nohelp", options, &run, NULL); + "nohelp", options, &run, NULL); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/"); return ok; } -- cgit v1.2.3