*/
STATE_PEERS_LINKING,
- /**
- * Announcing regexes
- */
- STATE_ANNOUNCE_REGEX,
-
/**
* Matching strings against announced regexes
*/
*/
unsigned int id;
+ /**
+ * Peer configuration handle.
+ */
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+
/**
* The actual testbed peer handle.
*/
*/
static struct GNUNET_TIME_Relative prof_time;
-/**
- * Current peer id
- */
-static unsigned int peer_id;
-
/**
* Number of peers to be started by the profiler
*/
*/
static struct GNUNET_TIME_Relative search_delay = { 60000 };
-/**
- * Delay before setting mesh service op as done.
- */
-static struct GNUNET_TIME_Relative mesh_done_delay = { 1000 };
-
/**
* Delay to wait before starting to configure the overlay topology
*/
{
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));
+ 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");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
}
if (NULL != peers[peer_cnt].mesh_op_handle)
if (NULL != data_file)
GNUNET_DISK_file_close (data_file);
- for (search_str_cnt = 0;
- search_str_cnt < num_search_strings && NULL != search_strings;
+ for (search_str_cnt = 0;
+ search_str_cnt < num_search_strings && NULL != search_strings;
search_str_cnt++)
{
GNUNET_free_non_null (search_strings[search_str_cnt]);
/**
- * 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
/**
- * Stats callback.
+ * 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
/**
- * 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
peer->mesh_tunnel_handle = GNUNET_MESH_tunnel_create (peer->mesh_handle,
NULL,
- &mesh_peer_connect_handler,
+ &mesh_peer_connect_handler,
&mesh_peer_disconnect_handler,
peer);
/************************ MESH SERVICE CONNECTIONS **************************/
/******************************************************************************/
-/**
- * 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)
- */
-static 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");
-
- return NULL;
-}
-
-
-/**
- * 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
- */
-static 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");
-}
-
-
/**
* Method called whenever a peer has disconnected from the tunnel.
* Implementations of this callback must NOT call
/**
- * 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
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, peer->id, peers_found, num_search_strings);
peer->search_str_matched = GNUNET_SYSERR;
}
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);
+ 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 == peer->stats_handle)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot get statistics for peer %u, stats handle is NULL!\n");
+ "Cannot get statistics for peer %u, stats handle is NULL!\n");
return;
}
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,
/**
- * 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
/**
- * 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
/**
- * Delayed operation done for mesh service disconnects.
- *
- * @param cls NULL
- * @param tc the task context
- */
-static void
-do_mesh_op_done (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
-{
- struct RegexPeer *peer = cls;
- static unsigned int peer_cnt;
- GNUNET_TESTBED_operation_done (peer->mesh_op_handle);
- peer->mesh_op_handle = NULL;
-
- if (++peer_cnt < num_peers)
- {
- 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]);
- }
-}
-
-
-/**
- * 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.
void *ca_result, const char *emsg)
{
struct RegexPeer *peer = (struct RegexPeer *) cls;
- char *regex;
- char *data;
- char *buf;
- uint64_t filesize;
- unsigned int offset;
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);
-
- switch (state)
- {
- case STATE_ANNOUNCE_REGEX:
- {
- static unsigned int num_files_announced;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Announcing regexes for peer %u with file %s\n",
- peer->id, peer->policy_file);
-
- 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 %u \n",
- regex, peer->id);
- GNUNET_MESH_announce_regex (peer->mesh_handle, regex, max_path_compression);
- buf = &data[offset + 1];
- }
- else if ((data[offset] == '\n') || (data[offset] == '\0'))
- buf = &data[offset + 1];
- }
- GNUNET_free (data);
- GNUNET_SCHEDULER_add_delayed (mesh_done_delay, &do_mesh_op_done, peer);
-
- if (++num_files_announced == num_peers)
- {
- state = STATE_SEARCH_REGEX;
-
- prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
-
- printf ("All files announced in %s.\n",
- GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO));
- printf ("Waiting %s before starting to search.\n",
- GNUNET_STRINGS_relative_time_to_string (search_delay, GNUNET_YES));
- fflush (stdout);
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "All regexes announced in %s. Waiting %s before starting to search.\n",
- GNUNET_STRINGS_relative_time_to_string (prof_time, GNUNET_NO),
- GNUNET_STRINGS_relative_time_to_string (search_delay, GNUNET_NO));
-
- search_task = GNUNET_SCHEDULER_add_delayed (search_delay,
- &do_connect_by_string, NULL);
- }
- break;
- }
- case STATE_SEARCH_REGEX:
- {
- /* 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);
- break;
- }
- default:
- GNUNET_break (0);
- }
+ /* 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.
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;
}
*/
static void
do_configure_topology (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+ const struct GNUNET_SCHEDULER_TaskContext * tc)
{
/*
if (0 == linking_factor)
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);
+ 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");
+ "Cannot create topology, op handle was NULL\n");
GNUNET_assert (0);
}
}
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));
+ "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));
+ 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;
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);
/**
- * 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)
GNUNET_TESTBED_host_get_hostname (peer->host_handle),
filename);
+ /* 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,
peer->host_handle,
- cfg,
+ 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;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
{
static unsigned int slaves_started;
- unsigned int peer_cnt;
+ unsigned int peer_cnt;
dll_op = event->details.operation_finished.op_cls;
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
prof_start_time = GNUNET_TIME_absolute_get ();
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;
+ 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;
- }
+ /* 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,
if (NULL != event->details.operation_finished.emsg)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("An operation has failed while linking\n"));
+ _("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
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));
+ "%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");
+ 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");
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Connecting to mesh service and start announcing regex...\n");
- printf ("\nStarting to connect to mesh services and announce regex\n");
+
+ printf ("\nWaiting %s before starting to search.\n",
+ GNUNET_STRINGS_relative_time_to_string (search_delay, GNUNET_YES));
fflush (stdout);
-
- prof_start_time = GNUNET_TIME_absolute_get ();
- peers[0].mesh_op_handle =
- GNUNET_TESTBED_service_connect (NULL,
- peers[0].peer_handle,
- "mesh",
- &mesh_connect_cb,
- &peers[0],
- &mesh_ca,
- &mesh_da,
- &peers[0]);
- state = STATE_ANNOUNCE_REGEX;
+
+ 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;
GNUNET_assert (0);
}
break;
- case STATE_ANNOUNCE_REGEX:
- {
- /* Handled in service connect callback */
- break;
- }
case STATE_SEARCH_REGEX:
{
/* Handled in service connect callback */
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Unexpected controller_cb with state %i!\n", state);
+ "Unexpected controller_cb with state %i!\n", state);
}
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
/**
- * 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;
projects / oweals / gnunet.git / blobdiff