[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24437 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24437 - gnunet/src/mesh |
Date: |
Sat, 20 Oct 2012 12:39:33 +0200 |
Author: szengel
Date: 2012-10-20 12:39:33 +0200 (Sat, 20 Oct 2012)
New Revision: 24437
Modified:
gnunet/src/mesh/gnunet-regex-profiler.c
gnunet/src/mesh/regex_profiler_test.conf
Log:
Updated regex profiler config with mesh and dht default arm services
Modified: gnunet/src/mesh/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/mesh/gnunet-regex-profiler.c 2012-10-20 09:31:31 UTC (rev
24436)
+++ gnunet/src/mesh/gnunet-regex-profiler.c 2012-10-20 10:39:33 UTC (rev
24437)
@@ -257,7 +257,12 @@
*/
static GNUNET_SCHEDULER_TaskIdentifier search_task;
+/**
+ * Search timeout task identifier.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier search_timeout_task;
+
/**
* Shutdown nicely
*
@@ -400,6 +405,8 @@
{
// struct Peer *peer = (struct Peer *)cls;
+ GNUNET_SCHEDULER_cancel (search_timeout_task);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh peer connect handler.\n");
printf ("\nString successfully matched\n");
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
@@ -446,9 +453,9 @@
GNUNET_MESH_peer_request_connect_by_string (peers[0].mesh_tunnel_handle,
search_string);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 30),
- &do_connect_by_string_timeout, (void
*)(long)30);
+ search_timeout_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_relative_multiply
+
(GNUNET_TIME_UNIT_SECONDS, 30),
+
&do_connect_by_string_timeout, (void *)(long)30);
}
@@ -489,7 +496,6 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Could not find policy file %s\n", peer->policy_file);
- GNUNET_TESTBED_operation_done (peer->op_handle);
return;
}
if (GNUNET_OK != GNUNET_DISK_file_size (peer->policy_file, &filesize,
GNUNET_YES, GNUNET_YES))
@@ -497,7 +503,6 @@
if (0 == filesize)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Policy file %s is empty.\n",
peer->policy_file);
- GNUNET_TESTBED_operation_done (peer->op_handle);
return;
}
data = GNUNET_malloc (filesize);
@@ -506,7 +511,6 @@
GNUNET_free (data);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not read policy file %s.\n",
peer->policy_file);
- GNUNET_TESTBED_operation_done (peer->op_handle);
return;
}
buf = data;
Modified: gnunet/src/mesh/regex_profiler_test.conf
===================================================================
--- gnunet/src/mesh/regex_profiler_test.conf 2012-10-20 09:31:31 UTC (rev
24436)
+++ gnunet/src/mesh/regex_profiler_test.conf 2012-10-20 10:39:33 UTC (rev
24437)
@@ -5,7 +5,6 @@
HOSTNAME = localhost
MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 5
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
[fs]
AUTOSTART = NO
@@ -15,6 +14,9 @@
[mesh]
AUTOSTART = NO
+APP_ANNOUNCE_TIME = 4 s
+ID_ANNOUNCE_TIME = 4 s
+CONNECT_TIMEOUT = 30 s
[dht]
AUTOSTART = NO
@@ -43,7 +45,7 @@
AUTOSTART = YES
[arm]
-DEFAULTSERVICES = core
+DEFAULTSERVICES = core mesh dht
PORT = 12366
DEBUG = NO
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24437 - gnunet/src/mesh,
gnunet <=