[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24455 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24455 - gnunet/src/mesh |
Date: |
Mon, 22 Oct 2012 15:52:59 +0200 |
Author: szengel
Date: 2012-10-22 15:52:59 +0200 (Mon, 22 Oct 2012)
New Revision: 24455
Modified:
gnunet/src/mesh/gnunet-regex-profiler.c
gnunet/src/mesh/regex_profiler_test.conf
Log:
regex profiler: measuring the time it takes to match all strings
Modified: gnunet/src/mesh/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/mesh/gnunet-regex-profiler.c 2012-10-22 13:46:42 UTC (rev
24454)
+++ gnunet/src/mesh/gnunet-regex-profiler.c 2012-10-22 13:52:59 UTC (rev
24455)
@@ -443,15 +443,28 @@
const struct GNUNET_PeerIdentity* peer_id,
const struct GNUNET_ATS_Information * atsi)
{
- // struct Peer *peer = (struct Peer *)cls;
const char * search_str = (const char *)cls;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh peer connect handler.\n");
- printf ("String %s successfully matched\n", search_str);
+ peers_found++;
- if (++peers_found == num_search_strings)
+ if (NULL == peer_id)
{
- printf ("\nAll strings successfully matched!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "String matching timed out for string %s (%i/%i)\n",
+ search_str, peers_found, num_search_strings);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "String %s successfully matched (%i/%i)\n",
+ search_str, peers_found, num_search_strings);
+ }
+
+ 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_SCHEDULER_cancel (search_timeout_task);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
@@ -494,7 +507,8 @@
{
peer = &peers[search_cnt % num_peers];
- printf ("Searching for string \"%s\"\n", search_strings[search_cnt]);
+ printf ("Searching for string \"%s\" on peer %d\n",
+ search_strings[search_cnt], (search_cnt % num_peers));
peer->mesh_tunnel_handle = GNUNET_MESH_tunnel_create (peer->mesh_handle,
NULL,
@@ -506,6 +520,8 @@
}
+ prof_start_time = GNUNET_TIME_absolute_get ();
+
search_timeout_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, search_timeout_sec),
&do_connect_by_string_timeout, (void *)search_timeout_sec);
@@ -588,7 +604,8 @@
if (++connected_mesh_handles == num_peers)
{
- printf ("\nAll mesh handles connected.\nWaiting to search.\n");
+ printf ("\nAll mesh handles connected.\nWaiting %ld minutes before
starting to search.\n",
+ search_wait_min);
search_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES,
search_wait_min),
@@ -701,7 +718,8 @@
topology_op =
GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers,
peer_handles,
GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
- num_links);
+ num_links,
+
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
if (NULL == topology_op)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
Modified: gnunet/src/mesh/regex_profiler_test.conf
===================================================================
--- gnunet/src/mesh/regex_profiler_test.conf 2012-10-22 13:46:42 UTC (rev
24454)
+++ gnunet/src/mesh/regex_profiler_test.conf 2012-10-22 13:52:59 UTC (rev
24455)
@@ -14,9 +14,9 @@
[mesh]
AUTOSTART = NO
-APP_ANNOUNCE_TIME = 4 s
-ID_ANNOUNCE_TIME = 4 s
-CONNECT_TIMEOUT = 30 s
+APP_ANNOUNCE_TIME = 5 s
+ID_ANNOUNCE_TIME = 5 s
+CONNECT_TIMEOUT = 10 s
[dht]
AUTOSTART = NO
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24455 - gnunet/src/mesh,
gnunet <=