/*
This file is part of GNUnet.
- (C) 2010 Christian Grothoff (and other contributing authors)
+ (C) 2010, 2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
*/
#include "platform.h"
#include "fs_test_lib.h"
+#include "gnunet_testbed_service.h"
#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
/**
* How long do we give the peers for content migration?
*/
-#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90)
#define SEED 42
-static struct GNUNET_FS_TestDaemon *daemons[2];
-
-static struct GNUNET_SCHEDULER_Handle *sched;
+static struct GNUNET_TESTBED_Peer *daemons[2];
static int ok;
static struct GNUNET_TIME_Absolute start_time;
+static struct GNUNET_TESTBED_Operation *op;
+
+
+struct DownloadContext
+{
+ char *fn;
+
+ struct GNUNET_FS_Uri *uri;
+};
+
+
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 (sched,
- 1,
- 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);
- }
+ GNUNET_SCHEDULER_shutdown ();
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+ {
+ del = GNUNET_TIME_absolute_get_duration (start_time);
+ if (del.rel_value_us == 0)
+ del.rel_value_us = 1;
+ fancy =
+ GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
+ 1000000LL / del.rel_value_us);
+ 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 struct GNUNET_SCHEDULER_TaskContext *tc)
+ const char *emsg)
{
- struct GNUNET_FS_Uri *uri = cls;
-
- GNUNET_FS_TEST_daemons_stop (sched, 1, &daemons[1]);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Downloading %llu bytes\n",
- (unsigned long long) FILESIZE);
+ struct DownloadContext *dc = cls;
+ struct GNUNET_FS_Uri *uri = dc->uri;
+
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
+ if (NULL != dc->fn)
+ {
+ GNUNET_DISK_directory_remove (dc->fn);
+ GNUNET_free (dc->fn);
+ }
+ GNUNET_free (dc);
+ if (NULL != emsg)
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ 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);
start_time = GNUNET_TIME_absolute_get ();
- GNUNET_FS_TEST_download (sched,
- daemons[0],
- TIMEOUT,
- 1, SEED, uri,
- VERBOSE,
- &do_stop, NULL);
+ GNUNET_FS_TEST_download (daemons[0], TIMEOUT, 1, SEED, uri, VERBOSE, &do_stop,
+ NULL);
+ GNUNET_FS_uri_destroy (uri);
}
static void
-do_wait (void *cls,
- const struct GNUNET_FS_Uri *uri)
+stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_FS_Uri *d;
+ struct DownloadContext *dc = cls;
- if (NULL == uri)
- {
- GNUNET_FS_TEST_daemons_stop (sched,
- 2,
- daemons);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout during upload attempt, shutting down with error\n");
- ok = 1;
- return;
- }
- d = GNUNET_FS_uri_dup (uri);
- GNUNET_SCHEDULER_add_delayed (sched,
- MIGRATION_DELAY,
- &do_download,
- d);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n");
+ op = GNUNET_TESTBED_peer_stop (NULL, daemons[1], &do_download, dc);
+ GNUNET_assert (NULL != op);
}
-
static void
-do_publish (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_wait (void *cls, const struct GNUNET_FS_Uri *uri,
+ const char *fn)
{
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
- {
- GNUNET_FS_TEST_daemons_stop (sched,
- 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);
- GNUNET_FS_TEST_publish (sched,
- daemons[1],
- TIMEOUT,
- 1, GNUNET_NO, FILESIZE, SEED,
- VERBOSE,
- &do_wait, NULL);
-}
-
+ struct DownloadContext *dc;
-static void
-do_connect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Daemons started, will now try to connect them\n");
- GNUNET_FS_TEST_daemons_connect (sched,
- daemons[0],
- daemons[1],
- TIMEOUT,
- &do_publish,
- NULL);
+ if (NULL == uri)
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ 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");
+ dc = GNUNET_new (struct DownloadContext);
+ dc->uri = GNUNET_FS_uri_dup (uri);
+ if (NULL != fn)
+ dc->fn = GNUNET_strdup (fn);
+ (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, &stop_source_peer, dc);
}
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+do_publish (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
+ unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
- sched = s;
- GNUNET_FS_TEST_daemons_start (sched,
- "test_gnunet_service_fs_migration_data.conf",
- TIMEOUT,
- 2,
- daemons,
- &do_connect,
- NULL);
+ unsigned int i;
+
+ GNUNET_assert (2 == num_peers);
+ for (i=0;i<num_peers;i++)
+ daemons[i] = peers[i];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing %llu bytes\n",
+ (unsigned long long) FILESIZE);
+ GNUNET_FS_TEST_publish (daemons[1], TIMEOUT, 1, GNUNET_NO, FILESIZE, SEED,
+ VERBOSE, &do_wait, NULL);
}
int
main (int argc, char *argv[])
{
- char *const argvx[] = {
- "test-gnunet-service-fs-migration",
- "-c",
- "fs_test_lib_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
- GNUNET_log_setup ("test_gnunet_service_fs_migration",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "test-gnunet-service-fs-migration",
- "nohelp", options, &run, NULL);
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+ (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
+ "fs_test_lib_data.conf",
+ 2,
+ 0, NULL, NULL,
+ &do_publish,
+ NULL);
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
return ok;
}
projects / oweals / gnunet.git / blobdiff