* @author Christian Grothoff
*/
#include "platform.h"
-#include "test_fs_lib.h"
+#include "fs_test_lib.h"
#define VERBOSE GNUNET_YES
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
#define NUM_DAEMONS 2
static struct GNUNET_SCHEDULER_Handle *sched;
+static int ok;
+
+static struct GNUNET_TIME_Absolute start_time;
static void
do_stop (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Finished download, shutting down\n",
- (unsigned long long) FILESIZE);
+ struct GNUNET_TIME_Relative del;
+ char *fancy;
+
GNUNET_FS_TEST_daemons_stop (sched,
NUM_DAEMONS,
daemons);
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ {
+ del = GNUNET_TIME_absolute_get_duration (start_time);
+ if (del.value == 0)
+ del.value = 1;
+ fancy = GNUNET_STRINGS_byte_size_fancy (((unsigned long long)FILESIZE) * 1000LL / del.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;
+ }
}
do_download (void *cls,
const struct GNUNET_FS_Uri *uri)
{
- GNUNET_assert (NULL != uri);
+ if (NULL == uri)
+ {
+ GNUNET_FS_TEST_daemons_stop (sched,
+ NUM_DAEMONS,
+ 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,
"Downloading %llu bytes\n",
(unsigned long long) FILESIZE);
+ start_time = GNUNET_TIME_absolute_get ();
GNUNET_FS_TEST_download (sched,
daemons[0],
TIMEOUT,
do_publish (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ {
+ GNUNET_FS_TEST_daemons_stop (sched,
+ NUM_DAEMONS,
+ 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);
GNUNET_FS_TEST_publish (sched,
- daemons[0],
+ daemons[1],
TIMEOUT,
1, GNUNET_NO, FILESIZE, SEED,
VERBOSE,
char *const argvx[] = {
"test-gnunet-service-fs-p2p",
"-c",
- "test_fs_lib_data.conf",
+ "fs_test_lib_data.conf",
#if VERBOSE
"-L", "DEBUG",
#endif
argvx, "test-gnunet-service-fs-p2p",
"nohelp", options, &run, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
- return 0;
+ return ok;
}
/* end of test_gnunet_service_fs_p2p.c */