/*
This file is part of GNUnet.
- (C) 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010, 2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
*/
#include "platform.h"
#include "fs_test_lib.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
/**
* File-size we use for testing.
*/
-#define FILESIZE (1024 * 1024 * 500)
+#define FILESIZE (1024 * 1024 * 10)
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 30)
#define NUM_DAEMONS 2
#define SEED 42
-static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS];
-
-static struct GNUNET_SCHEDULER_Handle *sched;
+static struct GNUNET_TESTBED_Peer *daemons[NUM_DAEMONS];
static int ok;
static struct GNUNET_TIME_Absolute start_time;
-static void
-do_stop (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_FS_TEST_daemons_stop (sched,
- NUM_DAEMONS,
- daemons);
-}
+static const char *progname;
+
+static struct GNUNET_TIME_Absolute start_time;
/**
*/
struct StatMaster
{
- struct GNUNET_STATISTICS_Handle *stat;
+ struct GNUNET_STATISTICS_Handle *stat;
+ struct GNUNET_TESTBED_Operation *op;
unsigned int daemon;
unsigned int value;
};
/**
* Statistics we print out.
*/
-static struct StatValues stats[] =
- {
- { "fs", "# queries forwarded"},
- { "fs", "# replies received and matched"},
- { "fs", "# results found locally"},
- { "fs", "# requests forwarded due to high load"},
- { "fs", "# requests done for free (low load)"},
- { "fs", "# P2P searches received"},
- { "fs", "# replies received for local clients"},
- { "fs", "# P2P searches discarded (queue length bound)"},
- { "fs", "# requests dropped due to high load"},
- { "fs", "# requests dropped by datastore (queue length limit)"},
- { "fs", "# queries retransmitted to same target"},
- { "fs", "cummulative artificial delay introduced (ms)"},
- { "core", "# bytes decrypted"},
- { "core", "# bytes encrypted"},
- { "core", "# transmissions delayed due to corking"},
- { "transport", "# bytes received via TCP"},
- { "transport", "# bytes transmitted via TCP"},
- { "datacache", "# bytes stored"},
- { "dht", "# DHT ROUTE Requests Seen"},
- { "dht", "# DHT ROUTE Requests Forwarded"},
- { NULL, NULL}
- };
+static struct StatValues stats[] = {
+ {"fs", "# queries forwarded"},
+ {"fs", "# replies received and matched"},
+ {"fs", "# results found locally"},
+ {"fs", "# requests forwarded due to high load"},
+ {"fs", "# requests done for free (low load)"},
+ {"fs", "# requests dropped, priority insufficient"},
+ {"fs", "# requests done for a price (normal load)"},
+ {"fs", "# requests dropped by datastore (queue length limit)"},
+ {"fs", "# P2P searches received"},
+ {"fs", "# P2P searches discarded (queue length bound)"},
+ {"fs", "# replies received for local clients"},
+ {"fs", "# queries retransmitted to same target"},
+ {"core", "# bytes decrypted"},
+ {"core", "# bytes encrypted"},
+ {"core", "# discarded CORE_SEND requests"},
+ {"core", "# discarded CORE_SEND request bytes"},
+ {"core", "# discarded lower priority CORE_SEND requests"},
+ {"core", "# discarded lower priority CORE_SEND request bytes"},
+ {"transport", "# bytes received via TCP"},
+ {"transport", "# bytes transmitted via TCP"},
+ {"datacache", "# bytes stored"},
+ {NULL, NULL}
+};
/**
* @param subsystem name of subsystem that created the statistic
* @param name the name of the datum
* @param value the current value
- * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
- * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not
+ * @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;
}
*/
static void
stat_run (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+ struct GNUNET_TESTBED_Operation *op,
+ void *ca_result,
+ const char *emsg);
/**
* Function called when GET operation on stats is done.
*/
static void
-get_done (void *cls,
- int success)
+get_done (void *cls, int success)
{
struct StatMaster *sm = cls;
- GNUNET_break (GNUNET_OK == success);
+
+ GNUNET_break (GNUNET_OK == success);
sm->value++;
- GNUNET_SCHEDULER_add_now (sched, &stat_run, sm);
+ stat_run (sm, sm->op, sm->stat, NULL);
}
/**
- * Function that gathers stats from all daemons.
+ * Adapter function called to establish a connection to
+ * statistics service.
+ *
+ * @param cls closure
+ * @param cfg configuration of the peer to connect to; will be available until
+ * GNUNET_TESTBED_operation_done() is called on the operation returned
+ * from GNUNET_TESTBED_service_connect()
+ * @return service handle to return in 'op_result', NULL on error
*/
-static void
-stat_run (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void *
+statistics_connect_adapter (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct StatMaster *sm = cls;
-
- if (stats[sm->value].name != NULL)
- {
- GNUNET_STATISTICS_get (sm->stat,
-#if 0
- NULL, NULL,
-#else
- stats[sm->value].subsystem,
- stats[sm->value].name,
-#endif
- GNUNET_TIME_UNIT_FOREVER_REL,
- &get_done,
- &print_stat, sm);
- return;
- }
- GNUNET_STATISTICS_destroy (sm->stat, GNUNET_NO);
- sm->value = 0;
- sm->daemon++;
- if (sm->daemon == NUM_DAEMONS)
- {
- GNUNET_free (sm);
- GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL);
- return;
- }
- sm->stat = GNUNET_STATISTICS_create (sched, "<driver>",
- GNUNET_FS_TEST_get_configuration (daemons,
- sm->daemon));
- GNUNET_SCHEDULER_add_now (sched, &stat_run, sm);
+ return GNUNET_STATISTICS_create ("<driver>",
+ cfg);
}
+/**
+ * Adapter function called to destroy a connection to
+ * statistics service.
+ *
+ * @param cls closure
+ * @param op_result service handle returned from the connect adapter
+ */
static void
-do_report (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+statistics_disconnect_adapter (void *cls,
+ void *op_result)
{
- struct GNUNET_TIME_Relative del;
- char *fancy;
- struct StatMaster *sm;
-
- 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);
- sm = GNUNET_malloc (sizeof (struct StatMaster));
- sm->stat = GNUNET_STATISTICS_create (sched, "<driver>",
- GNUNET_FS_TEST_get_configuration (daemons,
- sm->daemon));
- GNUNET_SCHEDULER_add_now (sched, &stat_run, sm);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Timeout during download, shutting down with error\n");
- ok = 1;
- GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL);
- }
+ GNUNET_STATISTICS_destroy (op_result, GNUNET_NO);
}
+/**
+ * Function that gathers stats from all daemons.
+ */
static void
-do_download (void *cls,
- const struct GNUNET_FS_Uri *uri)
+stat_run (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ void *ca_result,
+ const char *emsg)
{
- if (NULL == uri)
+ struct StatMaster *sm = cls;
+
+ if (NULL != emsg)
{
- GNUNET_FS_TEST_daemons_stop (sched,
- NUM_DAEMONS,
- daemons);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Timeout during upload attempt, shutting down with error\n");
- ok = 1;
+ "Failed to statistics service: %s\n",
+ emsg);
+ GNUNET_SCHEDULER_shutdown ();
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_report, NULL);
+ sm->stat = ca_result;
+
+ if (stats[sm->value].name != NULL)
+ {
+ GNUNET_STATISTICS_get (sm->stat,
+#if 0
+ NULL, NULL,
+#else
+ stats[sm->value].subsystem, stats[sm->value].name,
+#endif
+ &get_done, &print_stat,
+ sm);
+ return;
+ }
+ GNUNET_TESTBED_operation_done (sm->op);
+ sm->value = 0;
+ sm->daemon++;
+ if (NUM_DAEMONS == sm->daemon)
+ {
+ GNUNET_free (sm);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ sm->op =
+ GNUNET_TESTBED_service_connect (NULL,
+ daemons[sm->daemon],
+ "statistics",
+ &stat_run, sm,
+ &statistics_connect_adapter,
+ &statistics_disconnect_adapter,
+ NULL);
}
static void
-do_publish (void *cls,
- const char *emsg)
+do_report (void *cls)
{
- if (NULL != emsg)
- {
- GNUNET_FS_TEST_daemons_stop (sched,
- NUM_DAEMONS,
- daemons);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error trying to connect: %s\n",
- emsg);
- ok = 1;
- return;
- }
+ char *fn = cls;
+ struct GNUNET_TIME_Relative del;
+ char *fancy;
+ struct StatMaster *sm;
+
+ if (NULL != fn)
+ {
+ GNUNET_DISK_directory_remove (fn);
+ GNUNET_free (fn);
+ }
+ if (0 ==
+ GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add (start_time,
+ TIMEOUT)).rel_value_us)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout during download, shutting down with error\n");
+ ok = 1;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+
+ 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,
- "Publishing %llu bytes\n",
- (unsigned long long) FILESIZE);
- GNUNET_FS_TEST_publish (sched,
- daemons[NUM_DAEMONS-1],
- TIMEOUT,
- 1, GNUNET_NO, FILESIZE, SEED,
- VERBOSE,
- &do_download, NULL);
+ "Finished download, shutting down\n");
+ sm = GNUNET_new (struct StatMaster);
+ sm->op =
+ GNUNET_TESTBED_service_connect (NULL,
+ daemons[sm->daemon],
+ "statistics",
+ &stat_run, sm,
+ &statistics_connect_adapter,
+ &statistics_disconnect_adapter,
+ NULL);
}
static void
-do_connect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_download (void *cls,
+ const struct GNUNET_FS_Uri *uri,
+ const char *fn)
{
- struct GNUNET_TESTING_PeerGroup *pg;
+ int anonymity;
- 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");
- pg = GNUNET_FS_TEST_get_group (daemons);
- GNUNET_break ( (NUM_DAEMONS - 1) * 2
- == (GNUNET_TESTING_create_topology (pg,
- GNUNET_TESTING_TOPOLOGY_LINE,
- GNUNET_TESTING_TOPOLOGY_NONE,
- NULL)));
- GNUNET_TESTING_connect_topology (pg,
- GNUNET_TESTING_TOPOLOGY_LINE,
- GNUNET_TESTING_TOPOLOGY_OPTION_NONE,
- 0.0,
- &do_publish,
- NULL);
+ if (NULL == uri)
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "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 ();
+ if (NULL != strstr (progname, "dht"))
+ anonymity = 0;
+ else
+ anonymity = 1;
+ start_time = GNUNET_TIME_absolute_get ();
+ GNUNET_FS_TEST_download (daemons[0],
+ TIMEOUT,
+ anonymity,
+ SEED,
+ uri,
+ VERBOSE,
+ &do_report,
+ (NULL == fn) ? NULL : GNUNET_strdup (fn));
}
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,
- "fs_test_lib_data.conf",
- TIMEOUT,
- NUM_DAEMONS,
- daemons,
- &do_connect,
- NULL);
+ unsigned int i;
+ int do_index;
+ int anonymity;
+
+ GNUNET_assert (NUM_DAEMONS == 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);
+ if (NULL != strstr (progname, "index"))
+ do_index = GNUNET_YES;
+ else
+ do_index = GNUNET_NO;
+ if (NULL != strstr (progname, "dht"))
+ anonymity = 0;
+ else
+ anonymity = 1;
+ GNUNET_FS_TEST_publish (daemons[NUM_DAEMONS - 1], TIMEOUT, anonymity,
+ do_index, FILESIZE, SEED, VERBOSE, &do_download,
+ NULL);
}
int
main (int argc, char *argv[])
{
- char *const argvx[] = {
- "perf-gnunet-service-fs-p2p",
- "-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 ("perf_gnunet_service_fs_p2p",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "perf-gnunet-service-fs-p2p",
- "nohelp", options, &run, NULL);
+ progname = argv[0];
+ (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p",
+ "perf_gnunet_service_fs_p2p.conf",
+ NUM_DAEMONS,
+ 0, NULL, NULL,
+ &do_publish, NULL);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
return ok;
}
projects / oweals / gnunet.git / blobdiff