* Download speed of type `seeder 1' was 757 KiB/s
* Download speed of type `seeder 2' was 613 KiB/s
* Download speed of type `leach` was 539 KiB/s
- *
+ *
* - 10 MB, 3 peers, without delays:
* Download speed of type `seeder 1' was 1784 KiB/s
* Download speed of type `seeder 2' was 1604 KiB/s
/**
* File-size we use for testing.
*/
-#define FILESIZE (1024 * 1024 * 10)
+#define FILESIZE (1024 * 1024 * 1)
/**
* How long until we give up on transmitting the message?
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
static int
-print_stat (void *cls,
- const char *subsystem,
- const char *name, uint64_t value, int is_persistent)
+print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+ int is_persistent)
{
struct StatMaster *sm = cls;
- fprintf (stderr,
- "Peer %2u: %12s/%50s = %12llu\n",
- sm->daemon, subsystem, name, (unsigned long long) value);
+ FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
+ name, (unsigned long long) value);
return GNUNET_OK;
}
/**
* Function that gathers stats from all daemons.
*/
-static void stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void
+stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
#else
stats[sm->value].subsystem, stats[sm->value].name,
#endif
- GNUNET_TIME_UNIT_FOREVER_REL,
- &get_done, &print_stat, sm);
+ GNUNET_TIME_UNIT_FOREVER_REL, &get_done, &print_stat,
+ sm);
return;
}
GNUNET_STATISTICS_destroy (sm->stat, GNUNET_NO);
GNUNET_SCHEDULER_add_now (&do_stop, NULL);
return;
}
- sm->stat = GNUNET_STATISTICS_create ("<driver>",
- GNUNET_FS_TEST_get_configuration
- (daemons, sm->daemon));
+ sm->stat =
+ GNUNET_STATISTICS_create ("<driver>",
+ GNUNET_FS_TEST_get_configuration (daemons,
+ sm->daemon));
GNUNET_SCHEDULER_add_now (&stat_run, sm);
}
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000LL / del.rel_value);
- fprintf (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
+ FPRINTF (stderr, "Download speed of type `%s' was %s/s\n", type, fancy);
GNUNET_free (fancy);
if (NUM_DAEMONS != ++download_counter)
return; /* more downloads to come */
"Finished all downloads, shutting down\n",
(unsigned long long) FILESIZE);
sm = GNUNET_malloc (sizeof (struct StatMaster));
- sm->stat = GNUNET_STATISTICS_create ("<driver>",
- GNUNET_FS_TEST_get_configuration
- (daemons, sm->daemon));
+ sm->stat =
+ GNUNET_STATISTICS_create ("<driver>",
+ GNUNET_FS_TEST_get_configuration (daemons,
+ sm->daemon));
GNUNET_SCHEDULER_add_now (&stat_run, sm);
}
else
return;
}
uri2 = GNUNET_FS_uri_dup (u2);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Downloading %llu bytes\n", (unsigned long long) FILESIZE);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
+ (unsigned long long) FILESIZE);
start_time = GNUNET_TIME_absolute_get ();
if (NULL != strstr (progname, "dht"))
anonymity = 0;
* these peers do participate in sharing, they just
* don't have to offer anything *initially*. */
for (i = 0; i < NUM_DAEMONS - 2; i++)
- GNUNET_FS_TEST_download (daemons[i],
- TIMEOUT,
- anonymity,
+ GNUNET_FS_TEST_download (daemons[i], TIMEOUT, anonymity,
0 == (i % 2) ? SEED1 : SEED2,
- 0 == (i % 2) ? uri1 : uri2,
- VERBOSE, &do_report, "leach");
+ 0 == (i % 2) ? uri1 : uri2, VERBOSE, &do_report,
+ "leach");
/* mutual downloads of (primary) sharing peers */
- GNUNET_FS_TEST_download (daemons[NUM_DAEMONS - 2],
- TIMEOUT,
- anonymity, SEED1, uri1,
- VERBOSE, &do_report, "seeder 2");
- GNUNET_FS_TEST_download (daemons[NUM_DAEMONS - 1],
- TIMEOUT,
- anonymity, SEED2, uri2,
- VERBOSE, &do_report, "seeder 1");
+ GNUNET_FS_TEST_download (daemons[NUM_DAEMONS - 2], TIMEOUT, anonymity, SEED1,
+ uri1, VERBOSE, &do_report, "seeder 2");
+ GNUNET_FS_TEST_download (daemons[NUM_DAEMONS - 1], TIMEOUT, anonymity, SEED2,
+ uri2, VERBOSE, &do_report, "seeder 1");
}
return;
}
uri1 = GNUNET_FS_uri_dup (u1);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Publishing %llu bytes\n", (unsigned long long) FILESIZE);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+ (unsigned long long) FILESIZE);
if (NULL != strstr (progname, "index"))
do_index = GNUNET_YES;
else
else
anonymity = 1;
- GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS - 2],
- TIMEOUT,
- anonymity,
- do_index, FILESIZE, SEED2,
- VERBOSE, &do_downloads, NULL);
+ GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS - 2], TIMEOUT, anonymity,
+ do_index, FILESIZE, SEED2, VERBOSE, &do_downloads,
+ NULL);
}
static void
ok = 1;
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Publishing %llu bytes\n", (unsigned long long) FILESIZE);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+ (unsigned long long) FILESIZE);
if (NULL != strstr (progname, "index"))
do_index = GNUNET_YES;
else
else
anonymity = 1;
- GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS - 1],
- TIMEOUT,
- anonymity,
- do_index, FILESIZE, SEED1,
- VERBOSE, &do_publish2, NULL);
+ GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS - 1], TIMEOUT, anonymity,
+ do_index, FILESIZE, SEED1, VERBOSE, &do_publish2,
+ NULL);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Daemons started, will now try to connect them\n");
pg = GNUNET_FS_TEST_get_group (daemons);
- GNUNET_TESTING_create_topology (pg,
- GNUNET_TESTING_TOPOLOGY_CLIQUE,
+ GNUNET_TESTING_create_topology (pg, GNUNET_TESTING_TOPOLOGY_CLIQUE,
GNUNET_TESTING_TOPOLOGY_NONE, NULL);
- GNUNET_TESTING_connect_topology (pg,
- GNUNET_TESTING_TOPOLOGY_CLIQUE,
- GNUNET_TESTING_TOPOLOGY_OPTION_NONE,
- 0.0,
+ GNUNET_TESTING_connect_topology (pg, GNUNET_TESTING_TOPOLOGY_CLIQUE,
+ GNUNET_TESTING_TOPOLOGY_OPTION_NONE, 0.0,
TIMEOUT, NUM_DAEMONS, &do_publish1, NULL);
}
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf",
- TIMEOUT,
- NUM_DAEMONS, daemons, &do_connect, NULL);
+ GNUNET_FS_TEST_daemons_start ("fs_test_lib_data.conf", TIMEOUT, NUM_DAEMONS,
+ daemons, &do_connect, NULL);
}
"WARNING",
#endif
NULL);
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "perf-gnunet-service-fs-p2p-trust",
- "nohelp", options, &run, NULL);
+ GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
+ "perf-gnunet-service-fs-p2p-trust", "nohelp", options,
+ &run, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
return ok;
}