/*
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
*/
#include "platform.h"
#include "fs_test_lib.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_service.h"
#define VERBOSE GNUNET_NO
/**
* How long do we give the peers for content migration?
*/
-#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#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_TESTBED_Peer *daemons[2];
static int ok;
static struct GNUNET_TIME_Absolute start_time;
+static struct GNUNET_TESTBED_Operation *op;
+
+
static void
do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TIME_Relative del;
char *fancy;
- GNUNET_FS_TEST_daemons_stop (2, daemons);
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ GNUNET_SCHEDULER_shutdown ();
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
{
del = GNUNET_TIME_absolute_get_duration (start_time);
if (del.rel_value == 0)
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
1000LL / del.rel_value);
- fprintf (stdout, "Download speed was %s/s\n", fancy);
+ 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);
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_TESTBED_operation_done (op);
+ op = NULL;
+ if (NULL != emsg)
{
- GNUNET_FS_TEST_daemons_stop (2, daemons);
+ GNUNET_SCHEDULER_shutdown ();
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to stop source daemon: %s\n",
emsg);
GNUNET_FS_uri_destroy (uri);
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");
- pg = GNUNET_FS_TEST_get_group (daemons);
- GNUNET_TESTING_daemons_vary (pg, 1, GNUNET_NO, TIMEOUT, &do_download, uri);
+ op = GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+ GNUNET_assert (NULL != op);
}
if (NULL == uri)
{
- GNUNET_FS_TEST_daemons_stop (2, daemons);
+ GNUNET_SCHEDULER_shutdown ();
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout during upload attempt, shutting down with error\n");
ok = 1;
static void
-do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_publish (void *cls,
+ struct GNUNET_TESTBED_Operation *oparg,
+ const char *emsg)
{
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ GNUNET_assert (op == oparg);
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
+ if (NULL != emsg)
{
- GNUNET_FS_TEST_daemons_stop (2, daemons);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout during connect attempt, shutting down with error\n");
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error connecting peers: %s\n",
+ emsg);
ok = 1;
return;
}
static void
-do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_connect (void *cls,
+ unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers)
{
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
- {
- fprintf (stderr, "Daemons failed to start!\n");
- GNUNET_break (0);
- ok = 1;
- return;
- }
+ 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,
"Daemons started, will now try to connect them\n");
- GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT, &do_publish,
- NULL);
-}
-
-
-static void
-run (void *cls, char *const *args, 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);
+ op = GNUNET_TESTBED_overlay_connect (NULL,
+ &do_publish, NULL,
+ daemons[0], daemons[1]);
}
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/test-gnunet-service-fs-migration/");
- 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_TESTBED_test_run ("test-gnunet-service-fs-migration",
+ "fs_test_lib_data.conf",
+ 2,
+ 0, NULL, NULL,
+ &do_connect,
+ NULL);
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
return ok;
}
projects / oweals / gnunet.git / blobdiff