From 033331f8cb21f4236afa1954c07d4de8f92a01b1 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Wed, 26 Sep 2012 09:37:52 +0000 Subject: - timeout sooner on stall --- src/mesh/test_mesh_small.c | 8 ++++---- src/mesh/test_mesh_small.conf | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index ec08b53c4..839382301 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c @@ -47,12 +47,12 @@ struct MeshPeer /** * How long until we give up on connecting the peers? */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) /** * Time to wait for stuff that should be rather fast */ -#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) +#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) /** * DIFFERENT TESTS TO RUN @@ -126,7 +126,7 @@ static struct GNUNET_DISK_FileHandle *output_file; static struct GNUNET_DISK_FileHandle *data_file; /** - * How many data points to capture before triggering next round? + * Wait time */ static struct GNUNET_TIME_Relative wait_time; @@ -637,7 +637,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n"); GNUNET_MESH_peer_request_connect_add (t, &d2->id); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "schedule timeout in 90s\n"); + "schedule timeout in SHORT_TIME\n"); if (GNUNET_SCHEDULER_NO_TASK != disconnect_task) { GNUNET_SCHEDULER_cancel (disconnect_task); diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index 7151203db..057a4fa12 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf @@ -2,6 +2,21 @@ SERVICEHOME = /tmp/test_mesh_small/ DEFAULTCONFIG = test_mesh_small.conf +[mesh] +PORT = 10005 +DEBUG = YES +ACCEPT_FROM = 127.0.0.1; +HOSTNAME = localhost +REFRESH_PATH_TIME = 5 s +APP_ANNOUNCE_TIME = 2 s +ID_ANNOUNCE_TIME = 2 s +UNACKNOWLEDGED_WAIT = 2 s +CONNECT_TIMEOUT = 30 s +DEFAULT_TTL = 64 +DHT_REPLICAITON_LEVEL = 10 +PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp +# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args + [arm] PORT = 10010 DEFAULTSERVICES = core dht mesh @@ -58,21 +73,6 @@ PORT = 10003 AUTOSTART = YES PORT = 10004 -[mesh] -PORT = 10005 -DEBUG = YES -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -REFRESH_PATH_TIME = 5 s -APP_ANNOUNCE_TIME = 5 s -ID_ANNOUNCE_TIME = 5 s -UNACKNOWLEDGED_WAIT = 2 s -CONNECT_TIMEOUT = 30 s -DEFAULT_TTL = 64 -DHT_REPLICAITON_LEVEL = 10 -# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp -# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args - [testing] WEAKRANDOM = YES @@ -105,6 +105,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75 DELETE_FILES = YES [test_mesh_small] -WAIT_TIME = 300 s +WAIT_TIME = 30 s CONNECTION_LIMIT = 16 #DATA_OUTPUT_FILE=data_output -- cgit v1.2.3