/*
This file is part of GNUnet
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 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.
*/
/**
* @author Florian Dold
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
+#include "gnunet_time_lib.h"
#include "gnunet_consensus_service.h"
#include "gnunet_testbed_service.h"
static struct GNUNET_TIME_Relative conclude_timeout;
+static struct GNUNET_TIME_Relative consensus_delay;
+
static struct GNUNET_CONSENSUS_Handle **consensus_handles;
static struct GNUNET_TESTBED_Operation **testbed_operations;
static unsigned int peers_done = 0;
+static int dist_static;
+
static unsigned *results_for_peer;
+/**
+ * The profiler will write statistics
+ * for all peers to the file with this name.
+ */
+static char *statistics_filename;
+
+/**
+ * The profiler will write statistics
+ * for all peers to this file.
+ */
+static FILE *statistics_file;
+
static int verbose;
+/**
+ * Start time for all consensuses.
+ */
+static struct GNUNET_TIME_Absolute start;
+
+/**
+ * Deadline for all consensuses.
+ */
+static struct GNUNET_TIME_Absolute deadline;
+
/**
* Signature of the event handler function called by the
* @param event information about the event
*/
static void
-controller_cb(void *cls,
- const struct GNUNET_TESTBED_EventInformation *event)
+controller_cb (void *cls,
+ const struct GNUNET_TESTBED_EventInformation *event)
{
GNUNET_assert (0);
}
+
static void
-destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *ctx)
+statistics_done_cb (void *cls,
+ struct
+ GNUNET_TESTBED_Operation
+ *op,
+ const char *emsg)
{
- struct GNUNET_CONSENSUS_Handle *consensus;
- consensus = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "destroying consensus\n");
+ GNUNET_assert (NULL == emsg);
+ GNUNET_TESTBED_operation_done (op);
+ if (NULL != statistics_file)
+ fclose (statistics_file);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got statistics, shutting down\n");
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Callback function to process statistic values from all peers.
+ *
+ * @param cls closure
+ * @param peer the peer the statistic belong to
+ * @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
+ */
+static int
+statistics_cb (void *cls,
+ const struct GNUNET_TESTBED_Peer *peer,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
+ int is_persistent)
+{
+ if (NULL != statistics_file)
+ {
+ fprintf (statistics_file, "P%u\t%s\t%s\t%lu\n", GNUNET_TESTBED_get_index (peer), subsystem, name, (unsigned long) value);
+ }
+ return GNUNET_OK;
+}
+
+
+static void
+destroy (void *cls)
+{
+ struct GNUNET_CONSENSUS_Handle *consensus = cls;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "destroying consensus\n");
GNUNET_CONSENSUS_destroy (consensus);
peers_done++;
if (peers_done == num_peers)
for (i = 0; i < num_peers; i++)
GNUNET_TESTBED_operation_done (testbed_operations[i]);
for (i = 0; i < num_peers; i++)
- printf ("P%u got %u of %u elements\n", i, results_for_peer[i], num_values);
- GNUNET_SCHEDULER_shutdown ();
+ printf ("P%u got %u of %u elements\n",
+ i,
+ results_for_peer[i],
+ num_values);
+ if (NULL != statistics_filename)
+ statistics_file = fopen (statistics_filename, "w");
+ GNUNET_TESTBED_get_statistics (num_peers, peers, NULL, NULL,
+ statistics_cb,
+ statistics_done_cb,
+ NULL);
}
}
* Called when a conclusion was successful.
*
* @param cls closure, the consensus handle
- * @return GNUNET_YES if more consensus groups should be offered, GNUNET_NO if not
+ * @return #GNUNET_YES if more consensus groups should be offered,
+ * #GNUNET_NO if not
*/
static void
conclude_cb (void *cls)
{
struct GNUNET_CONSENSUS_Handle **chp = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "consensus %d done\n", chp - consensus_handles);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "consensus %d done\n",
+ (int) (chp - consensus_handles));
GNUNET_SCHEDULER_add_now (destroy, *chp);
}
do_consensus ()
{
int unique_indices[replication];
- int i;
+ unsigned int i;
+ unsigned int j;
+ struct GNUNET_HashCode val;
+ struct GNUNET_SET_Element element;
- for (i = 0; i < num_values; i++)
+ if (dist_static)
{
- int j;
- struct GNUNET_HashCode *val;
- struct GNUNET_SET_Element *element;
- generate_indices(unique_indices);
-
- val = GNUNET_malloc (sizeof *val);
- GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, val);
+ for (i = 0; i < num_values; i++)
+ {
- element = GNUNET_malloc (sizeof *element);
- element->data = val;
- element->size = sizeof *val;
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &val);
- for (j = 0; j < replication; j++)
+ element.data = &val;
+ element.size = sizeof (val);
+ for (j = 0; j < replication; j++)
+ {
+ GNUNET_CONSENSUS_insert (consensus_handles[j],
+ &element,
+ NULL, NULL);
+ }
+ }
+ }
+ else
+ {
+ for (i = 0; i < num_values; i++)
{
- int cid;
- cid = unique_indices[j];
- GNUNET_CONSENSUS_insert (consensus_handles[cid], element, NULL, NULL);
+ generate_indices (unique_indices);
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &val);
+
+ element.data = &val;
+ element.size = sizeof (val);
+ for (j = 0; j < replication; j++)
+ {
+ int cid;
+
+ cid = unique_indices[j];
+ GNUNET_CONSENSUS_insert (consensus_handles[cid],
+ &element,
+ NULL, NULL);
+ }
}
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "all elements inserted, calling conclude\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "all elements inserted, calling conclude\n");
for (i = 0; i < num_peers; i++)
- GNUNET_CONSENSUS_conclude (consensus_handles[i], conclude_timeout, conclude_cb, &consensus_handles[i]);
+ GNUNET_CONSENSUS_conclude (consensus_handles[i],
+ conclude_cb, &consensus_handles[i]);
}
if (NULL != emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "testbed connect emsg: %s\n", emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "testbed connect emsg: %s\n",
+ emsg);
GNUNET_assert (0);
}
num_connected_handles++;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "connect complete\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "connect complete\n");
if (num_connected_handles == num_peers)
{
int idx = chp - consensus_handles;
GNUNET_assert (NULL != cls);
-
+
results_for_peer[idx]++;
GNUNET_assert (sizeof (struct GNUNET_HashCode) == element->size);
if (GNUNET_YES == verbose)
{
- printf ("P%d received %s\n", idx, GNUNET_h2s ((struct GNUNET_HashCode *) element->data));
+ printf ("P%d received %s\n",
+ idx,
+ GNUNET_h2s ((struct GNUNET_HashCode *) element->data));
}
}
struct GNUNET_CONSENSUS_Handle *consensus;
chp = (struct GNUNET_CONSENSUS_Handle **) cls;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "connect adapter, %d peers\n", num_peers);
- consensus = GNUNET_CONSENSUS_create (cfg, num_peers, peer_ids, &session_id, new_element_cb, chp);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "connect adapter, %d peers\n",
+ num_peers);
+ consensus = GNUNET_CONSENSUS_create (cfg,
+ num_peers, peer_ids,
+ &session_id,
+ start,
+ deadline,
+ &new_element_cb, chp);
*chp = (struct GNUNET_CONSENSUS_Handle *) consensus;
return consensus;
}
disconnect_adapter(void *cls, void *op_result)
{
/* FIXME: what to do here? */
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "disconnect adapter called\n");
}
* Signature of a main function for a testcase.
*
* @param cls closure
+ * @param h the run handle
* @param num_peers number of peers in 'peers'
* @param started_peers handle to peers run in the testbed. NULL upon timeout (see
* GNUNET_TESTBED_test_run()).
*/
static void
test_master (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers,
struct GNUNET_TESTBED_Peer **started_peers,
unsigned int links_succeeded,
&peer_ids[i]);
}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static char *session_str = "gnunet-consensus/test";
char *topology;
+ int topology_cmp_result;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "testbed", "OVERLAY_TOPOLOGY", &topology))
{
- fprintf (stderr, "'OVERLAY_TOPOLOGY' not found in 'testbed' config section, "
- "seems like you passed the wrong configuration file\n");
+ fprintf (stderr,
+ "'OVERLAY_TOPOLOGY' not found in 'testbed' config section, "
+ "seems like you passed the wrong configuration file\n");
return;
}
- if (0 == strcasecmp (topology, "NONE"))
+ topology_cmp_result = strcasecmp (topology, "NONE");
+ GNUNET_free (topology);
+
+ if (0 == topology_cmp_result)
{
- fprintf (stderr, "'OVERLAY_TOPOLOGY' set to 'NONE', "
- "seems like you passed the wrong configuration file\n");
+ fprintf (stderr,
+ "'OVERLAY_TOPOLOGY' set to 'NONE', "
+ "seems like you passed the wrong configuration file\n");
return;
}
- GNUNET_free (topology);
-
if (num_peers < replication)
{
fprintf (stderr, "k must be <=n\n");
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "running gnunet-consensus\n");
+ start = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), consensus_delay);
+ deadline = GNUNET_TIME_absolute_add (start, conclude_timeout);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "running gnunet-consensus\n");
GNUNET_CRYPTO_hash (session_str, strlen(session_str), &session_id);
gettext_noop ("number of peers in consensus"),
GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers },
{ 'k', "value-replication", NULL,
- gettext_noop ("how many peers receive one value?"),
+ gettext_noop ("how many peers (random selection without replacement) receive one value?"),
GNUNET_YES, &GNUNET_GETOPT_set_uint, &replication },
{ 'x', "num-values", NULL,
gettext_noop ("number of values"),
{ 't', "timeout", NULL,
gettext_noop ("consensus timeout"),
GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &conclude_timeout },
+ { 'd', "delay", NULL,
+ gettext_noop ("delay until consensus starts"),
+ GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &consensus_delay },
+ { 's', "statistics", NULL,
+ gettext_noop ("write statistics to file"),
+ GNUNET_YES, &GNUNET_GETOPT_set_filename, &statistics_filename },
+ { 'S', "dist-static", NULL,
+ gettext_noop ("distribute elements to a static subset of good peers"),
+ GNUNET_YES, &GNUNET_GETOPT_set_one, &dist_static },
{ 'V', "verbose", NULL,
gettext_noop ("be more verbose (print received values)"),
GNUNET_NO, &GNUNET_GETOPT_set_one, &verbose },
GNUNET_GETOPT_OPTION_END
};
conclude_timeout = GNUNET_TIME_UNIT_SECONDS;
- GNUNET_PROGRAM_run2 (argc, argv, "gnunet-consensus",
+ GNUNET_PROGRAM_run2 (argc, argv, "gnunet-consensus-profiler",
"help",
options, &run, NULL, GNUNET_YES);
return 0;
}
-
projects / oweals / gnunet.git / blobdiff