-/*
+/**
This file is part of GNUnet.
(C) 2011, 2012 Christian Grothoff (and other contributing authors)
* @brief Regex profiler for testing distributed regex use.
* @author Bart Polot
* @author Max Szengel
+ *
*/
#include <string.h>
*/
STATE_PEERS_LINKING,
+ /**
+ * Matching strings against announced regexes
+ */
+ STATE_SEARCH_REGEX,
+
/**
* Destroying peers; we can do this as the controller takes care of stopping a
* peer if it is running
};
-/**
- * An array of hosts loaded from the hostkeys file
- */
-static struct GNUNET_TESTBED_Host **hosts;
-
/**
* Peer handles.
*/
*/
unsigned int id;
+ /**
+ * Peer configuration handle.
+ */
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+
/**
* The actual testbed peer handle.
*/
*/
const char *search_str;
+ /**
+ * Set to GNUNET_YES if the peer successfully matched the above
+ * search string. GNUNET_NO if the string could not be matched
+ * during the profiler run. GNUNET_SYSERR if the string matching
+ * timed out. Undefined if search_str is NULL
+ */
+ int search_str_matched;
+
/**
* Peer's mesh handle.
*/
* Testbed operation handle for the statistics service.
*/
struct GNUNET_TESTBED_Operation *stats_op_handle;
+
+ /**
+ * The starting time of a profiling step.
+ */
+ struct GNUNET_TIME_Absolute prof_start_time;
};
+
+/**
+ * An array of hosts loaded from the hostkeys file
+ */
+static struct GNUNET_TESTBED_Host **hosts;
+
/**
* Array of peer handles used to pass to
* GNUNET_TESTBED_overlay_configure_topology
*/
-struct GNUNET_TESTBED_Peer **peer_handles;
+static struct GNUNET_TESTBED_Peer **peer_handles;
/**
* The array of peers; we fill this as the peers are given to us by the testbed
/**
* Handle to the master controller process
*/
-struct GNUNET_TESTBED_ControllerProc *mc_proc;
+static struct GNUNET_TESTBED_ControllerProc *mc_proc;
/**
* Handle to the master controller
*/
-struct GNUNET_TESTBED_Controller *mc;
+static struct GNUNET_TESTBED_Controller *mc;
/**
* Handle to global configuration
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* Head of the operations list
*/
-struct DLLOperation *dll_op_head;
+static struct DLLOperation *dll_op_head;
/**
* Tail of the operations list
*/
-struct DLLOperation *dll_op_tail;
+static struct DLLOperation *dll_op_tail;
/**
* Peer linking - topology operation
*/
-struct GNUNET_TESTBED_Operation *topology_op;
+static struct GNUNET_TESTBED_Operation *topology_op;
/**
* Abort task identifier
/**
* Global event mask for all testbed events
*/
-uint64_t event_mask;
+static uint64_t event_mask;
/**
* The starting time of a profiling step
*/
-struct GNUNET_TIME_Absolute prof_start_time;
+static struct GNUNET_TIME_Absolute prof_start_time;
/**
* Duration profiling step has taken
*/
-struct GNUNET_TIME_Relative prof_time;
-
-/**
- * Current peer id
- */
-unsigned int peer_id;
+static struct GNUNET_TIME_Relative prof_time;
/**
* Number of peers to be started by the profiler
static unsigned int num_hosts;
/**
- * Number of random links to be established between peers
+ * Factor of number of links. num_links = num_peers * linking_factor.
*/
-static unsigned int num_links;
+static unsigned int linking_factor;
/**
- * Number of timeout failures to tolerate
+ * Number of random links to be established between peers
*/
-static unsigned int num_cont_fails;
+static unsigned int num_links;
/**
* Number of times we try overlay connect operations
*/
static struct GNUNET_TIME_Relative search_delay = { 60000 };
+/**
+ * Delay to wait before starting to configure the overlay topology
+ */
+static struct GNUNET_TIME_Relative conf_topo_delay = { 10000 };
+
+/**
+ * File to log statistics to.
+ */
+static struct GNUNET_DISK_FileHandle *data_file;
+
+/**
+ * Filename to log statistics to.
+ */
+static char *data_filename;
+
+/**
+ * Maximal path compression length.
+ */
+static unsigned int max_path_compression;
+
+/******************************************************************************/
+/****************************** DECLARATIONS ********************************/
+/******************************************************************************/
+
+
+/**
+ * Method called whenever a peer has connected to the tunnel.
+ *
+ * @param cls closure
+ * @param peer_id peer identity the tunnel was created to, NULL on timeout
+ * @param atsi performance data for the connection
+ *
+ */
+static void
+mesh_peer_connect_handler (void *cls,
+ const struct GNUNET_PeerIdentity* peer_id,
+ const struct GNUNET_ATS_Information * atsi);
+
+
+/**
+ * Method called whenever a peer has disconnected from the tunnel.
+ * Implementations of this callback must NOT call
+ * GNUNET_MESH_tunnel_destroy immediately, but instead schedule those
+ * to run in some other task later. However, calling
+ * "GNUNET_MESH_notify_transmit_ready_cancel" is allowed.
+ *
+ * @param cls closure
+ * @param peer_id peer identity the tunnel stopped working with
+ */
+static void
+mesh_peer_disconnect_handler (void *cls,
+ const struct GNUNET_PeerIdentity * peer_id);
+
+/**
+ * Mesh connect callback.
+ *
+ * @param cls internal peer id.
+ * @param op operation handle.
+ * @param ca_result connect adapter result.
+ * @param emsg error message.
+ */
+static void
+mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
+ void *ca_result, const char *emsg);
+
+/**
+ * Mesh connect adapter.
+ *
+ * @param cls not used.
+ * @param cfg configuration handle.
+ *
+ * @return
+ */
+static void *
+mesh_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+
+/**
+ * Adapter function called to destroy a connection to
+ * the mesh service
+ *
+ * @param cls closure
+ * @param op_result service handle returned from the connect adapter
+ */
+static void
+mesh_da (void *cls, void *op_result);
+
+
+/******************************************************************************/
+/******************************** SHUTDOWN **********************************/
+/******************************************************************************/
+
/**
* Shutdown nicely
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct DLLOperation *dll_op;
+ struct RegexPeer *peer;
unsigned int nhost;
unsigned int peer_cnt;
unsigned int search_str_cnt;
-
+ char output_buffer[512];
+ size_t size;
+
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
+ if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task)
+ GNUNET_SCHEDULER_cancel (register_hosts_task);
+
for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
{
+ peer = &peers[peer_cnt];
+
+ if (GNUNET_YES != peer->search_str_matched && NULL != data_file)
+ {
+ prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time);
+ size =
+ GNUNET_snprintf (output_buffer,
+ sizeof (output_buffer),
+ "Search string not found: %s (%d)\nOn peer: %u (%p)\nWith policy file: %s\nAfter: %s\n",
+ peer->search_str,
+ peer->search_str_matched,
+ peer->id,
+ peer,
+ peer->policy_file,
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
+ if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+ }
+
if (NULL != peers[peer_cnt].mesh_op_handle)
- GNUNET_TESTBED_operation_cancel (peers[peer_cnt].mesh_op_handle);
+ GNUNET_TESTBED_operation_done (peers[peer_cnt].mesh_op_handle);
if (NULL != peers[peer_cnt].stats_op_handle)
- GNUNET_TESTBED_operation_cancel (peers[peer_cnt].stats_op_handle);
+ GNUNET_TESTBED_operation_done (peers[peer_cnt].stats_op_handle);
}
- for (search_str_cnt = 0; search_str_cnt < num_search_strings; search_str_cnt++)
+
+ if (NULL != data_file)
+ GNUNET_DISK_file_close (data_file);
+
+ for (search_str_cnt = 0;
+ search_str_cnt < num_search_strings && NULL != search_strings;
+ search_str_cnt++)
{
- GNUNET_free (search_strings[search_str_cnt]);
+ GNUNET_free_non_null (search_strings[search_str_cnt]);
}
- GNUNET_free (search_strings);
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
- GNUNET_SCHEDULER_cancel (abort_task);
- if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task)
- GNUNET_SCHEDULER_cancel (register_hosts_task);
+ GNUNET_free_non_null (search_strings);
+
if (NULL != reg_handle)
GNUNET_TESTBED_cancel_registration (reg_handle);
if (NULL != topology_op)
- GNUNET_TESTBED_operation_cancel (topology_op);
+ GNUNET_TESTBED_operation_done (topology_op);
for (nhost = 0; nhost < num_hosts; nhost++)
if (NULL != hosts[nhost])
GNUNET_TESTBED_host_destroy (hosts[nhost]);
GNUNET_free_non_null (hosts);
+
while (NULL != (dll_op = dll_op_head))
{
- GNUNET_TESTBED_operation_cancel (dll_op->op);
+ GNUNET_TESTBED_operation_done (dll_op->op);
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
GNUNET_free (dll_op);
}
/**
* 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
/**
* 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
+static void
stats_da (void *cls, void *op_result)
{
- GNUNET_STATISTICS_destroy (op_result, GNUNET_NO);
+ struct RegexPeer *peer = cls;
+
+ GNUNET_assert (op_result == peer->stats_handle);
+
+ GNUNET_STATISTICS_destroy (peer->stats_handle, GNUNET_NO);
+ peer->stats_handle = NULL;
}
/**
- * Process statistic values.
+ * Process statistic values. Write all values to global 'data_file', if present.
*
* @param cls closure
* @param subsystem name of subsystem that created the statistic
*/
static int
stats_iterator (void *cls, const char *subsystem, const char *name,
- uint64_t value, int is_persistent)
+ uint64_t value, int is_persistent)
{
struct RegexPeer *peer = cls;
- // char output_buffer[512];
- // size_t size;
+ char output_buffer[512];
+ size_t size;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stats iterator callback for peer %u\n", peer->id);
- /*
- if (NULL == output_file)
- {*/
+ if (NULL == data_file)
+ {
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%p -> %s [%s]: %llu\n",
- peer, subsystem, name, value);
+ "%p -> %s [%s]: %llu\n",
+ peer, subsystem, name, value);
return GNUNET_OK;
- /*
}
size =
GNUNET_snprintf (output_buffer,
- sizeof (output_buffer),
- "%p [%s] %s %llu\n",
- peer,
- subsystem, name, value);
- if (size != GNUNET_DISK_file_write (output_file, output_buffer, size))
+ sizeof (output_buffer),
+ "%p [%s] %llu %s\n",
+ peer,
+ subsystem, value, name);
+ if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
- */
+
return GNUNET_OK;
}
/**
- * Continuation callback for stats.
+ * Stats callback. Finish the stats testbed operation and when all stats have
+ * been iterated, shutdown the profiler.
*
* @param cls closure
* @param success GNUNET_OK if statistics were
* successfully obtained, GNUNET_SYSERR if not.
*/
static void
-stats_cont_cb (void *cls,
- int success)
+stats_cb (void *cls,
+ int success)
{
+ static unsigned int peer_cnt;
struct RegexPeer *peer = cls;
if (GNUNET_OK != success)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Getting statistics for peer %u failed!\n",
+ peer->id);
return;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stats continuation callback for peer %u.\n", peer->id);
+ GNUNET_TESTBED_operation_done (peer->stats_op_handle);
+ peer->stats_op_handle = NULL;
+ if (++peer_cnt == num_search_strings)
+ {
+ struct GNUNET_TIME_Relative delay = { 100 };
+ GNUNET_SCHEDULER_add_delayed (delay, &do_shutdown, NULL);
+ }
}
/**
- * Function called by testbed once we are connected to stats service.
+ * Function called by testbed once we are connected to stats service. Create a
+ * mesh tunnel and try to match the peer's string.
*
* @param cls the 'struct RegexPeer' for which we connected to stats
* @param op connect operation handle
* @param emsg error message on failure
*/
static void
-stats_connect_cb (void *cls,
- struct GNUNET_TESTBED_Operation *op,
- void *ca_result,
- const char *emsg)
+stats_connect_cb (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
+ void *ca_result,
+ const char *emsg)
{
struct RegexPeer *peer = cls;
- if (NULL == ca_result)
+ if (NULL == ca_result || NULL != emsg)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to statistics service on peer %u: %s\n",
- peer->id, emsg);
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ "Failed to connect to statistics service on peer %u: %s\n",
+ peer->id, emsg);
+
+ peer->stats_handle = NULL;
return;
}
- peer->stats_handle = ca_result;
-}
+ GNUNET_assert (NULL != peer->mesh_handle);
+ peer->stats_handle = ca_result;
-/******************************************************************************/
-/************************ MESH SERVICE CONNECTIONS **************************/
-/******************************************************************************/
+ peer->mesh_tunnel_handle = GNUNET_MESH_tunnel_create (peer->mesh_handle,
+ NULL,
+ &mesh_peer_connect_handler,
+ &mesh_peer_disconnect_handler,
+ peer);
-/**
- * Method called whenever another peer has added us to a tunnel
- * the other peer initiated.
- * Only called (once) upon reception of data with a message type which was
- * subscribed to in GNUNET_MESH_connect. A call to GNUNET_MESH_tunnel_destroy
- * causes te tunnel to be ignored and no further notifications are sent about
- * the same tunnel.
- *
- * @param cls closure
- * @param tunnel new handle to the tunnel
- * @param initiator peer that started the tunnel
- * @param atsi performance information for the tunnel
- * @return initial tunnel context for the tunnel
- * (can be NULL -- that's not an error)
- */
-void *
-mesh_inbound_tunnel_handler (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
- const struct GNUNET_PeerIdentity *initiator,
- const struct GNUNET_ATS_Information *atsi)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh inbound tunnel handler.\n");
+ peer->prof_start_time = GNUNET_TIME_absolute_get ();
- return NULL;
+ peer->search_str_matched = GNUNET_NO;
+ GNUNET_MESH_peer_request_connect_by_string (peer->mesh_tunnel_handle,
+ peer->search_str);
}
-/**
- * Function called whenever an inbound tunnel is destroyed. Should clean up
- * any associated state. This function is NOT called if the client has
- * explicitly asked for the tunnel to be destroyed using
- * GNUNET_MESH_tunnel_destroy. It must NOT call GNUNET_MESH_tunnel_destroy on
- * the tunnel.
- *
- * @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end (henceforth invalid)
- * @param tunnel_ctx place where local state associated
- * with the tunnel is stored
- */
-void
-mesh_tunnel_end_handler (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
- void *tunnel_ctx)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh tunnel end handler.\n");
-}
-
+/******************************************************************************/
+/************************ MESH SERVICE CONNECTIONS **************************/
+/******************************************************************************/
/**
* Method called whenever a peer has disconnected from the tunnel.
* @param cls closure
* @param peer_id peer identity the tunnel stopped working with
*/
-void
+static void
mesh_peer_disconnect_handler (void *cls,
const struct GNUNET_PeerIdentity * peer_id)
{
/**
- * Method called whenever a peer has connected to the tunnel.
+ * Method called when the mesh connection succeeded (or timed out), which means
+ * we've found a peer that announced a regex that matches our search string. Now
+ * get the statistics.
*
* @param cls closure
* @param peer_id peer identity the tunnel was created to, NULL on timeout
* @param atsi performance data for the connection
*
*/
-void
+static void
mesh_peer_connect_handler (void *cls,
const struct GNUNET_PeerIdentity* peer_id,
const struct GNUNET_ATS_Information * atsi)
{
struct RegexPeer *peer = cls;
+ char output_buffer[512];
+ size_t size;
peers_found++;
if (NULL == peer_id)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "String matching timed out for string %s on peer %u (%i/%i)\n",
- peer->search_str, peer->id, peers_found, num_search_strings);
+ "String matching timed out for string %s on peer %u (%i/%i)\n",
+ peer->search_str, peer->id, peers_found, num_search_strings);
+
+ printf ("String matching timed out for string %s on peer %u (%i/%i)\n",
+ peer->search_str, peer->id, peers_found, num_search_strings);
+
+ peer->search_str_matched = GNUNET_SYSERR;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "String %s successfully matched on peer %u (%i/%i)\n",
- peer->search_str, peer->id, peers_found, num_search_strings);
-
- GNUNET_STATISTICS_get (peer->stats_handle, "mesh", NULL,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &stats_cont_cb,
- &stats_iterator, peer);
+ prof_time = GNUNET_TIME_absolute_get_duration (peer->prof_start_time);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "String %s successfully matched on peer %u after %s (%i/%i)\n",
+ peer->search_str, peer->id, GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO),
+ peers_found, num_search_strings);
+
+ printf ("String %s successfully matched on peer %u after %s (%i/%i)\n",
+ peer->search_str, peer->id, GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO),
+ peers_found, num_search_strings);
+ fflush (stdout);
+
+ peer->search_str_matched = GNUNET_YES;
+
+ if (NULL != data_file)
+ {
+ size =
+ GNUNET_snprintf (output_buffer,
+ sizeof (output_buffer),
+ "Peer: %u (%p)\nHost: %s\nPolicy file: %s\nSearch string: %s\nSearch duration: %s\n\n",
+ peer->id,
+ peer,
+ GNUNET_TESTBED_host_get_hostname (peer->host_handle),
+ peer->policy_file,
+ peer->search_str,
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
+
+ if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+ }
+
+ if (NULL == peer->stats_handle)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Cannot get statistics for peer %u, stats handle is NULL!\n");
+ return;
+ }
+
+ if (NULL == GNUNET_STATISTICS_get (peer->stats_handle, "mesh", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL,
+ &stats_iterator, peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not get mesh statistics of peer %u!\n", peer->id);
+ }
+ if (NULL == GNUNET_STATISTICS_get (peer->stats_handle, "regexprofiler", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL,
+ &stats_iterator, peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not get regexprofiler statistics of peer %u!\n", peer->id);
+ }
+ if (NULL == GNUNET_STATISTICS_get (peer->stats_handle, "transport", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL,
+ &stats_iterator, peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not get transport statistics of peer %u!\n", peer->id);
+ }
+ if (NULL == GNUNET_STATISTICS_get (peer->stats_handle, "dht", NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &stats_cb,
+ &stats_iterator, peer))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not get dht statistics of peer %u!\n", peer->id);
+ }
}
if (peers_found == num_search_strings)
{
-
prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("\nAll strings successfully matched in %.2f minutes\n", ((double)prof_time.rel_value / 1000.0 / 60.0));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "All strings successfully matched in %s\n",
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
+ printf ("All strings successfully matched. Shutting down.\n");
+ fflush (stdout);
if (GNUNET_SCHEDULER_NO_TASK != search_timeout_task)
GNUNET_SCHEDULER_cancel (search_timeout_task);
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
}
/**
- * Connect by string timeout task
+ * Connect by string timeout task. This will cancel the profiler after the
+ * specified timeout 'search_timeout'.
*
* @param cls NULL
* @param tc the task context
*/
static void
do_connect_by_string_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+ const struct GNUNET_SCHEDULER_TaskContext * tc)
{
- printf ("Searching for all strings did not succeed after %s.\n",
- GNUNET_STRINGS_relative_time_to_string (search_timeout, GNUNET_NO));
- printf ("Found %i of %i strings\n", peers_found, num_search_strings);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Finding matches to all strings did not succeed after %s.\n",
+ GNUNET_STRINGS_relative_time_to_string (search_timeout, GNUNET_NO));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Found %i of %i strings\n", peers_found, num_search_strings);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
/**
- * Connect by string task that is run to search for a string in the NFA
+ * Connect by string task that is run to search for a string in the NFA. It
+ * first connects to the mesh service, then connects to the stats service of
+ * this peer and then it starts the string search.
*
* @param cls NULL
* @param tc the task context
unsigned int search_cnt;
struct RegexPeer *peer;
+ printf ("Starting string search.\n");
+ fflush (stdout);
+
for (search_cnt = 0; search_cnt < num_search_strings; search_cnt++)
{
peer = &peers[search_cnt % num_peers];
peer->search_str = search_strings[search_cnt];
+ peer->search_str_matched = GNUNET_NO;
- printf ("Searching for string \"%s\" on peer %d with file %s\n",
- peer->search_str, (search_cnt % num_peers), peer->policy_file);
-
- peer->mesh_tunnel_handle = GNUNET_MESH_tunnel_create (peer->mesh_handle,
- NULL,
- &mesh_peer_connect_handler,
- &mesh_peer_disconnect_handler,
- peer);
-
- GNUNET_MESH_peer_request_connect_by_string (peer->mesh_tunnel_handle,
- peer->search_str);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Searching for string \"%s\" on peer %d with file %s\n",
+ peer->search_str, (search_cnt % num_peers), peer->policy_file);
+
+ /* First connect to mesh service, then connect to stats service
+ and then try connecting by string in stats_connect_cb */
+ peer->mesh_op_handle =
+ GNUNET_TESTBED_service_connect (NULL,
+ peers->peer_handle,
+ "mesh",
+ &mesh_connect_cb,
+ peer,
+ &mesh_ca,
+ &mesh_da,
+ peer);
}
- prof_start_time = GNUNET_TIME_absolute_get ();
-
search_timeout_task = GNUNET_SCHEDULER_add_delayed (search_timeout,
- &do_connect_by_string_timeout, NULL);
+ &do_connect_by_string_timeout, NULL);
}
/**
- * Mesh connect callback.
+ * Mesh connect callback. Called when we are connected to the mesh service for
+ * the peer in 'cls'. If successfull we connect to the stats service of this
+ * peer and then try to match the search string of this peer.
*
* @param cls internal peer id.
* @param op operation handle.
* @param ca_result connect adapter result.
* @param emsg error message.
*/
-void
+static void
mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
void *ca_result, const char *emsg)
{
- static unsigned int connected_mesh_handles;
struct RegexPeer *peer = (struct RegexPeer *) cls;
- char *regex;
- char *data;
- char *buf;
- uint64_t filesize;
- unsigned int offset;
- if (NULL != emsg)
+ if (NULL != emsg || NULL == op || NULL == ca_result)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Mesh connect failed: %s\n", emsg);
GNUNET_assert (0);
}
+ GNUNET_assert (peer->mesh_handle != NULL);
GNUNET_assert (peer->mesh_op_handle == op);
GNUNET_assert (peer->mesh_handle == ca_result);
- GNUNET_assert (NULL != peer->policy_file);
-
- printf ("Announcing regexes for peer with file %s\n", peer->policy_file);
- fflush (stdout);
-
- if (GNUNET_YES != GNUNET_DISK_file_test (peer->policy_file))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Could not find policy file %s\n", peer->policy_file);
- return;
- }
- if (GNUNET_OK != GNUNET_DISK_file_size (peer->policy_file, &filesize, GNUNET_YES, GNUNET_YES))
- filesize = 0;
- if (0 == filesize)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Policy file %s is empty.\n", peer->policy_file);
- return;
- }
- data = GNUNET_malloc (filesize);
- if (filesize != GNUNET_DISK_fn_read (peer->policy_file, data, filesize))
- {
- GNUNET_free (data);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not read policy file %s.\n",
- peer->policy_file);
- return;
- }
- buf = data;
- offset = 0;
- regex = NULL;
- while (offset < (filesize - 1))
- {
- offset++;
- if (((data[offset] == '\n')) && (buf != &data[offset]))
- {
- data[offset] = '\0';
- regex = buf;
- GNUNET_assert (NULL != regex);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Announcing regex: %s on peer\n", regex);
- GNUNET_MESH_announce_regex (peer->mesh_handle, regex);
- buf = &data[offset + 1];
- }
- else if ((data[offset] == '\n') || (data[offset] == '\0'))
- buf = &data[offset + 1];
- }
- GNUNET_free (data);
- if (++connected_mesh_handles == num_peers)
- {
- printf ("\nAll mesh handles connected.\nWaiting %s before starting to search.\n",
- GNUNET_STRINGS_relative_time_to_string (search_delay, GNUNET_YES));
-
- search_task = GNUNET_SCHEDULER_add_delayed (search_delay,
- &do_connect_by_string, NULL);
- }
+ /* First connect to the stats service, then start to search */
+ peer->stats_op_handle =
+ GNUNET_TESTBED_service_connect (NULL,
+ peers->peer_handle,
+ "statistics",
+ &stats_connect_cb,
+ peer,
+ &stats_ca,
+ &stats_da,
+ peer);
}
/**
- * Mesh connect adapter.
+ * Mesh connect adapter. Opens a connection to the mesh service.
*
* @param cls not used.
* @param cfg configuration handle.
*
* @return
*/
-void *
+static void *
mesh_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_MESH_ApplicationType app;
app = (GNUNET_MESH_ApplicationType)0;
peer->mesh_handle =
- GNUNET_MESH_connect (cfg, cls, NULL, NULL, handlers, &app);
+ GNUNET_MESH_connect (cfg, peer, NULL, NULL, handlers, &app);
return peer->mesh_handle;
}
* @param cls closure
* @param op_result service handle returned from the connect adapter
*/
-void
+static void
mesh_da (void *cls, void *op_result)
{
struct RegexPeer *peer = (struct RegexPeer *) cls;
/******************************************************************************/
+/**
+ * Configure the peer overlay topology.
+ *
+ * @param cls NULL
+ * @param tc the task context
+ */
+static void
+do_configure_topology (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext * tc)
+{
+ /*
+ if (0 == linking_factor)
+ linking_factor = 1;
+ num_links = linking_factor * num_peers;
+ */
+ /* num_links = num_peers - 1; */
+ num_links = linking_factor;
+
+ /* Do overlay connect */
+ prof_start_time = GNUNET_TIME_absolute_get ();
+ topology_op =
+ GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peer_handles,
+ GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+ num_links,
+ GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY,
+ GNUNET_TESTBED_TOPOLOGY_OPTION_END);
+ if (NULL == topology_op)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Cannot create topology, op handle was NULL\n");
+ GNUNET_assert (0);
+ }
+}
+
+
/**
* Functions of this signature are called when a peer has been successfully
* started or stopped.
if (++started_peers == num_peers)
{
prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("All peers started successfully in %.2f seconds\n",
- ((double) prof_time.rel_value) / 1000.00);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "All peers started successfully in %s\n",
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
result = GNUNET_OK;
- if (0 == num_links)
- num_links = num_peers * 5;
-
peer_handles = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *) * num_peers);
for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
peer_handles[peer_cnt] = peers[peer_cnt].peer_handle;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Waiting %s before starting to link peers\n",
+ GNUNET_STRINGS_relative_time_to_string (conf_topo_delay, GNUNET_YES));
+
+ printf ("Waiting %s before starting to link peers\n",
+ GNUNET_STRINGS_relative_time_to_string (conf_topo_delay, GNUNET_YES));
+ fflush (stdout);
+
state = STATE_PEERS_LINKING;
- /* Do overlay connect */
- prof_start_time = GNUNET_TIME_absolute_get ();
- topology_op =
- GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peer_handles,
- GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
- num_links,
- GNUNET_TESTBED_TOPOLOGY_OPTION_END);
- if (NULL == topology_op)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot create topology, op handle was NULL\n");
- GNUNET_assert (0);
- }
+ GNUNET_SCHEDULER_add_delayed (conf_topo_delay, &do_configure_topology, NULL);
}
}
peer_ptr = dll_op->cls;
GNUNET_assert (NULL == peer_ptr->peer_handle);
+ GNUNET_CONFIGURATION_destroy (peer_ptr->cfg);
+ peer_ptr->cfg = NULL;
peer_ptr->peer_handle = peer;
GNUNET_TESTBED_operation_done (dll_op->op);
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
if (++created_peers == num_peers)
{
prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("All peers created successfully in %.2f seconds\n",
- ((double) prof_time.rel_value) / 1000.00);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "All peers created successfully in %s\n",
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
/* Now peers are to be started */
state = STATE_PEERS_STARTING;
prof_start_time = GNUNET_TIME_absolute_get ();
}
}
+
/**
- * Function called with a filename.
+ * Function called with a filename for each file in the policy directory. Create
+ * a peer for each filename and update the peer's configuration to include the
+ * max_path_compression specified as a command line argument as well as the
+ * policy_file for this peer. The gnunet-service-regexprofiler service is
+ * automatically started on this peer. The service reads the configurration and
+ * announces the regexes stored in the policy file 'filename'.
*
* @param cls closure
* @param filename complete filename (absolute path)
* @return GNUNET_OK to continue to iterate,
* GNUNET_SYSERR to abort iteration with error!
*/
-int
+static int
policy_filename_cb (void *cls, const char *filename)
{
static unsigned int peer_cnt;
struct DLLOperation *dll_op;
+ struct RegexPeer *peer = &peers[peer_cnt];
+
+ GNUNET_assert (NULL != peer);
+
+ peer->policy_file = GNUNET_strdup (filename);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating peer %i on host %s for policy file %s\n",
- peer_cnt,
- GNUNET_TESTBED_host_get_hostname (hosts[peer_cnt % num_hosts]),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Creating peer %i on host %s for policy file %s\n",
+ peer->id,
+ GNUNET_TESTBED_host_get_hostname (peer->host_handle),
filename);
- peers[peer_cnt].id = peer_cnt;
- peers[peer_cnt].policy_file = GNUNET_strdup (filename);
- peers[peer_cnt].host_handle = hosts[peer_cnt % num_hosts];
- peers[peer_cnt].mesh_handle = NULL;
- peers[peer_cnt].mesh_tunnel_handle = NULL;
- peers[peer_cnt].stats_handle = NULL;
- peers[peer_cnt].stats_op_handle = NULL;
+ /* Set configuration options specific for this peer
+ (max_path_compression and policy_file */
+ peer->cfg = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_CONFIGURATION_set_value_number (peer->cfg, "REGEXPROFILER",
+ "MAX_PATH_COMPRESSION",
+ (unsigned long long)max_path_compression);
+ GNUNET_CONFIGURATION_set_value_string (peer->cfg, "REGEXPROFILER",
+ "POLICY_FILE", filename);
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
dll_op->cls = &peers[peer_cnt];
dll_op->op = GNUNET_TESTBED_peer_create (mc,
- hosts[peer_cnt % num_hosts],
- cfg,
+ peer->host_handle,
+ peer->cfg,
&peer_create_cb,
dll_op);
GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op);
+
peer_cnt++;
return GNUNET_OK;
{
struct DLLOperation *dll_op;
struct GNUNET_TESTBED_Operation *op;
+ int ret;
switch (state)
{
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
{
static unsigned int slaves_started;
+ unsigned int peer_cnt;
dll_op = event->details.operation_finished.op_cls;
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("An operation has failed while starting slaves\n"));
GNUNET_TESTBED_operation_done (op);
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
- GNUNET_SCHEDULER_cancel (abort_task);
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ GNUNET_SCHEDULER_cancel (abort_task);
abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
return;
}
/* Proceed to start peers */
if (++slaves_started == num_hosts - 1)
{
- printf ("All slaves started successfully\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "All slaves started successfully\n");
state = STATE_PEERS_CREATING;
prof_start_time = GNUNET_TIME_absolute_get ();
- num_peers = GNUNET_DISK_directory_scan (policy_dir,
- NULL,
- NULL);
+ if (-1 == (ret = GNUNET_DISK_directory_scan (policy_dir,
+ NULL,
+ NULL)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("No files found in `%s'\n"),
+ policy_dir);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ num_peers = (unsigned int) ret;
peers = GNUNET_malloc (sizeof (struct RegexPeer) * num_peers);
+ /* Initialize peers */
+ for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
+ {
+ struct RegexPeer *peer = &peers[peer_cnt];
+ peer->id = peer_cnt;
+ peer->policy_file = NULL;
+ /* Do not start peers on hosts[0] (master controller) */
+ peer->host_handle = hosts[1 + (peer_cnt % (num_hosts -1))];
+ peer->mesh_handle = NULL;
+ peer->mesh_tunnel_handle = NULL;
+ peer->stats_handle = NULL;
+ peer->stats_op_handle = NULL;
+ peer->search_str = NULL;
+ peer->search_str_matched = GNUNET_NO;
+ }
+
GNUNET_DISK_directory_scan (policy_dir,
&policy_filename_cb,
NULL);
break;
case STATE_PEERS_LINKING:
switch (event->type)
+ {
+ static unsigned int established_links;
+ case GNUNET_TESTBED_ET_OPERATION_FINISHED:
+ /* Control reaches here when a peer linking operation fails */
+ if (NULL != event->details.operation_finished.emsg)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("An operation has failed while linking\n"));
+ printf ("F");
+ fflush (stdout);
+ retry_links++;
+ }
+ /* We do no retries, consider this link as established */
+ /* break; */
+ case GNUNET_TESTBED_ET_CONNECT:
+ {
+ char output_buffer[512];
+ size_t size;
+
+ if (0 == established_links)
+ printf ("Establishing links .");
+ else
+ {
+ printf (".");
+ fflush (stdout);
+ }
+ if (++established_links == num_links)
+ {
+ fflush (stdout);
+ prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%u links established in %s\n",
+ num_links,
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
+ result = GNUNET_OK;
+ GNUNET_free (peer_handles);
+
+ if (NULL != data_file)
+ {
+ size =
+ GNUNET_snprintf (output_buffer,
+ sizeof (output_buffer),
+ "# of peers: %u\n# of links established: %u\n"
+ "Time to establish links: %s\nLinking failures: %u\n"
+ "path compression length: %u\n# of search strings: %u\n",
+ num_peers,
+ (established_links - cont_fails),
+ GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO),
+ cont_fails,
+ max_path_compression,
+ num_search_strings);
+
+ if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+ }
+
+ printf ("\nWaiting %s before starting to search.\n",
+ GNUNET_STRINGS_relative_time_to_string (search_delay, GNUNET_YES));
+ fflush (stdout);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Waiting %s before starting to search.\n",
+ GNUNET_STRINGS_relative_time_to_string (search_delay, GNUNET_NO));
+
+ state = STATE_SEARCH_REGEX;
+
+ search_task = GNUNET_SCHEDULER_add_delayed (search_delay,
+ &do_connect_by_string, NULL);
+ }
+ }
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+ break;
+ case STATE_SEARCH_REGEX:
+ {
+ /* Handled in service connect callback */
+ break;
+ }
+ default:
+ switch (state)
{
- case GNUNET_TESTBED_ET_OPERATION_FINISHED:
- /* Control reaches here when a peer linking operation fails */
- if (NULL != event->details.operation_finished.emsg)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("An operation has failed while linking\n"));
- retry_links++;
- if (++cont_fails > num_cont_fails)
- {
- printf ("\nAborting due to very high failure rate");
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
- GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
- }
- }
- break;
- case GNUNET_TESTBED_ET_CONNECT:
- {
- static unsigned int established_links;
- unsigned int peer_cnt;
-
- if (0 == established_links)
- printf ("Establishing links\n .");
- else
- {
- printf (".");
- fflush (stdout);
- }
- if (++established_links == num_links)
- {
- prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("\n%u links established in %.2f seconds\n",
- num_links, ((double) prof_time.rel_value) / 1000.00);
- result = GNUNET_OK;
- GNUNET_free (peer_handles);
- printf ("\nConnecting to mesh and statistics service...\n");
- for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
- {
- peers[peer_cnt].mesh_op_handle =
- GNUNET_TESTBED_service_connect (NULL,
- peers[peer_cnt].peer_handle,
- "mesh",
- &mesh_connect_cb,
- &peers[peer_cnt],
- &mesh_ca,
- &mesh_da,
- &peers[peer_cnt]);
-
- peers[peer_cnt].stats_op_handle =
- GNUNET_TESTBED_service_connect (NULL,
- peers[peer_cnt].peer_handle,
- "statistics",
- &stats_connect_cb,
- &peers[peer_cnt],
- &stats_ca,
- &stats_da,
- &peers[peer_cnt]);
- }
- }
- }
+ case STATE_PEERS_CREATING:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create peer\n");
break;
default:
- GNUNET_assert (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unexpected controller_cb with state %i!\n", state);
}
- break;
- default:
GNUNET_assert (0);
}
}
/**
- * Task to register all hosts available in the global host list
+ * Task to register all hosts available in the global host list.
*
* @param cls NULL
* @param tc the scheduler task context
/**
- * Task to register all hosts available in the global host list
+ * Task to register all hosts available in the global host list.
*
* @param cls NULL
* @param tc the scheduler task context
register_hosts_task = GNUNET_SCHEDULER_NO_TASK;
if (reg_host == num_hosts - 1)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"All hosts successfully registered\n");
/* Start slaves */
state = STATE_SLAVES_STARTING;
/**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successfull startup of the controller process.
*
* @param cls the closure from GNUNET_TESTBED_controller_start()
* @param config the configuration with which the controller has been started;
&do_abort, NULL);
}
+
/**
* Load search strings from given filename. One search string per line.
*
* @param filename filename of the file containing the search strings.
- * @param strings set of strings loaded from file. Caller needs to free this
+ * @param strings set of strings loaded from file. Caller needs to free this
* if number returned is greater than zero.
+ * @param limit upper limit on the number of strings read from the file
* @return number of strings found in the file. GNUNET_SYSERR on error.
*/
static int
-load_search_strings (const char *filename, char ***strings)
+load_search_strings (const char *filename, char ***strings, unsigned int limit)
{
char *data;
char *buf;
buf = data;
offset = 0;
str_cnt = 0;
- while (offset < (filesize - 1))
+ while (offset < (filesize - 1) && str_cnt < limit)
{
offset++;
if (((data[offset] == '\n')) && (buf != &data[offset]))
return str_cnt;
}
+
/**
* Main function that will be run by the scheduler.
*
const struct GNUNET_CONFIGURATION_Handle *config)
{
unsigned int nhost;
+ unsigned int nsearchstrs;
if (NULL == args[0])
{
}
for (nhost = 0; nhost < num_hosts; nhost++)
{
- if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost]))
+ if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost], config))
{
fprintf (stderr, _("Host %s cannot start testbed\n"),
GNUNET_TESTBED_host_get_hostname (hosts[nhost]));
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
+ if ( (NULL != data_filename) &&
+ (NULL == (data_file =
+ GNUNET_DISK_file_open (data_filename,
+ GNUNET_DISK_OPEN_READWRITE |
+ GNUNET_DISK_OPEN_TRUNCATE |
+ GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE))) )
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+ "open",
+ data_filename);
if (GNUNET_YES != GNUNET_DISK_directory_test (args[1]))
{
fprintf (stderr, _("Specified policies directory does not exist. Exiting.\n"));
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
- num_search_strings = load_search_strings (args[2], &search_strings);
+ nsearchstrs = load_search_strings (args[2], &search_strings, num_search_strings);
+ if (num_search_strings != nsearchstrs)
+ {
+ num_search_strings = nsearchstrs;
+ fprintf (stderr, _("Error loading search strings. Given file does not contain enough strings. Exiting.\n"));
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
+ }
if (0 >= num_search_strings || NULL == search_strings)
{
fprintf (stderr, _("Error loading search strings. Exiting.\n"));
main (int argc, char *const *argv)
{
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- { 'n', "num-links", "COUNT",
- gettext_noop ("create COUNT number of random links"),
- GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_links },
- { 'e', "num-errors", "COUNT",
- gettext_noop ("tolerate COUNT number of continious timeout failures"),
- GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails },
- { 't', "matching-timeout", "TIMEOUT",
- gettext_noop ("wait TIMEOUT seconds before considering a string match as failed"),
+ {'d', "details", "FILENAME",
+ gettext_noop ("name of the file for writing statistics"),
+ 1, &GNUNET_GETOPT_set_string, &data_filename},
+ {'n', "num-links", "COUNT",
+ gettext_noop ("create COUNT number of random links between peers"),
+ GNUNET_YES, &GNUNET_GETOPT_set_uint, &linking_factor },
+ {'t', "matching-timeout", "TIMEOUT",
+ gettext_noop ("wait TIMEOUT before considering a string match as failed"),
GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &search_timeout },
- { 's', "search-delay", "DELAY",
- gettext_noop ("wait DELAY minutes before starting string search"),
+ {'s', "search-delay", "DELAY",
+ gettext_noop ("wait DELAY before starting string search"),
GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &search_delay },
+ {'a', "num-search-strings", "COUNT",
+ gettext_noop ("number of search strings to read from search strings file"),
+ GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_search_strings },
+ {'p', "max-path-compression", "MAX_PATH_COMPRESSION",
+ gettext_noop ("maximum path compression length"),
+ 1, &GNUNET_GETOPT_set_uint, &max_path_compression},
GNUNET_GETOPT_OPTION_END
};
int ret;
GNUNET_PROGRAM_run (argc, argv, "gnunet-regex-profiler [OPTIONS] hosts-file policy-dir search-strings-file",
_("Profiler for regex/mesh"),
options, &run, NULL);
+ GNUNET_free ((void*) argv);
if (GNUNET_OK != ret)
return ret;
if (GNUNET_OK != result)
projects / oweals / gnunet.git / blobdiff