static struct GNUNET_FS_Uri *uri2;
+static char *fn1;
+
+static char *fn2;
/**
* Master context for 'stat_run'.
};
+static void
+cleanup ()
+{
+ GNUNET_SCHEDULER_shutdown ();
+ if (NULL != fn1)
+ {
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ }
+ if (NULL != fn2)
+ {
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ }
+}
+
+
/**
* Callback function to process statistic values.
*
{
struct StatMaster *sm = cls;
- if (stats[sm->value].name != NULL)
+ sm->stat = ca_result;
+ GNUNET_assert (NULL != sm->stat);
+ if (NULL != stats[sm->value].name)
{
GNUNET_STATISTICS_get (sm->stat,
#if 0
if (NUM_DAEMONS == sm->daemon)
{
GNUNET_free (sm);
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
return;
}
sm->op =
"Timeout during download for type `%s', shutting down with error\n",
type);
ok = 1;
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
return;
}
del = GNUNET_TIME_absolute_get_duration (start_time);
- if (del.rel_value == 0)
- del.rel_value = 1;
+ if (del.rel_value_us == 0)
+ del.rel_value_us = 1;
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
- 1000LL / del.rel_value);
+ 1000000LL / del.rel_value_us);
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 */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Finished all downloads, shutting down\n",
- (unsigned long long) FILESIZE);
+ "Finished all downloads, getting statistics\n");
sm = GNUNET_malloc (sizeof (struct StatMaster));
sm->op =
GNUNET_TESTBED_service_connect (NULL,
static void
-do_downloads (void *cls, const struct GNUNET_FS_Uri *u2)
+do_downloads (void *cls, const struct GNUNET_FS_Uri *u2,
+ const char *fn)
{
int anonymity;
unsigned int i;
if (NULL == u2)
{
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during upload attempt, shutting down with error\n");
ok = 1;
return;
}
+ if (NULL != fn)
+ fn2 = GNUNET_strdup (fn);
uri2 = GNUNET_FS_uri_dup (u2);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Downloading %llu bytes\n",
(unsigned long long) FILESIZE);
static void
do_publish2 (void *cls,
- const struct GNUNET_FS_Uri *u1)
+ const struct GNUNET_FS_Uri *u1,
+ const char *fn)
{
int do_index;
int anonymity;
if (NULL == u1)
- {
- GNUNET_SCHEDULER_shutdown ();
+ {
+ cleanup ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout during upload attempt, shutting down with error\n");
ok = 1;
return;
}
+ if (NULL != fn)
+ fn1 = GNUNET_strdup (fn);
uri1 = GNUNET_FS_uri_dup (u1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
(unsigned long long) FILESIZE);
GNUNET_TESTBED_operation_done (op);
if (NULL != emsg)
{
- GNUNET_SCHEDULER_shutdown ();
+ cleanup ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error trying to connect: %s\n", emsg);
ok = 1;
return;
static void
do_connect (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
static unsigned int coco;
unsigned int i;
main (int argc, char *argv[])
{
progname = argv[0];
- GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
- "perf_gnunet_service_fs_p2p.conf",
- NUM_DAEMONS,
- 0, NULL, NULL,
- &do_connect, NULL);
+ (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
+ "perf_gnunet_service_fs_p2p.conf",
+ NUM_DAEMONS,
+ 0, NULL, NULL,
+ &do_connect, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
return ok;
}