diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-09-26 09:37:52 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-09-26 09:37:52 +0000 |
commit | 033331f8cb21f4236afa1954c07d4de8f92a01b1 (patch) | |
tree | 0d850ef1b742388f269f3dc7e532258fffb41ac5 /src | |
parent | d6d37a302aec13f96d9a52b26c4beaac59372429 (diff) | |
download | gnunet-033331f8cb21f4236afa1954c07d4de8f92a01b1.tar.gz gnunet-033331f8cb21f4236afa1954c07d4de8f92a01b1.zip |
- timeout sooner on stall
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/test_mesh_small.c | 8 | ||||
-rw-r--r-- | src/mesh/test_mesh_small.conf | 32 |
2 files changed, 20 insertions, 20 deletions
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 | |||
47 | /** | 47 | /** |
48 | * How long until we give up on connecting the peers? | 48 | * How long until we give up on connecting the peers? |
49 | */ | 49 | */ |
50 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500) | 50 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Time to wait for stuff that should be rather fast | 53 | * Time to wait for stuff that should be rather fast |
54 | */ | 54 | */ |
55 | #define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) | 55 | #define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * DIFFERENT TESTS TO RUN | 58 | * DIFFERENT TESTS TO RUN |
@@ -126,7 +126,7 @@ static struct GNUNET_DISK_FileHandle *output_file; | |||
126 | static struct GNUNET_DISK_FileHandle *data_file; | 126 | static struct GNUNET_DISK_FileHandle *data_file; |
127 | 127 | ||
128 | /** | 128 | /** |
129 | * How many data points to capture before triggering next round? | 129 | * Wait time |
130 | */ | 130 | */ |
131 | static struct GNUNET_TIME_Relative wait_time; | 131 | static struct GNUNET_TIME_Relative wait_time; |
132 | 132 | ||
@@ -637,7 +637,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
637 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n"); | 637 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n"); |
638 | GNUNET_MESH_peer_request_connect_add (t, &d2->id); | 638 | GNUNET_MESH_peer_request_connect_add (t, &d2->id); |
639 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 639 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
640 | "schedule timeout in 90s\n"); | 640 | "schedule timeout in SHORT_TIME\n"); |
641 | if (GNUNET_SCHEDULER_NO_TASK != disconnect_task) | 641 | if (GNUNET_SCHEDULER_NO_TASK != disconnect_task) |
642 | { | 642 | { |
643 | GNUNET_SCHEDULER_cancel (disconnect_task); | 643 | 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 @@ | |||
2 | SERVICEHOME = /tmp/test_mesh_small/ | 2 | SERVICEHOME = /tmp/test_mesh_small/ |
3 | DEFAULTCONFIG = test_mesh_small.conf | 3 | DEFAULTCONFIG = test_mesh_small.conf |
4 | 4 | ||
5 | [mesh] | ||
6 | PORT = 10005 | ||
7 | DEBUG = YES | ||
8 | ACCEPT_FROM = 127.0.0.1; | ||
9 | HOSTNAME = localhost | ||
10 | REFRESH_PATH_TIME = 5 s | ||
11 | APP_ANNOUNCE_TIME = 2 s | ||
12 | ID_ANNOUNCE_TIME = 2 s | ||
13 | UNACKNOWLEDGED_WAIT = 2 s | ||
14 | CONNECT_TIMEOUT = 30 s | ||
15 | DEFAULT_TTL = 64 | ||
16 | DHT_REPLICAITON_LEVEL = 10 | ||
17 | PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp | ||
18 | # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
19 | |||
5 | [arm] | 20 | [arm] |
6 | PORT = 10010 | 21 | PORT = 10010 |
7 | DEFAULTSERVICES = core dht mesh | 22 | DEFAULTSERVICES = core dht mesh |
@@ -58,21 +73,6 @@ PORT = 10003 | |||
58 | AUTOSTART = YES | 73 | AUTOSTART = YES |
59 | PORT = 10004 | 74 | PORT = 10004 |
60 | 75 | ||
61 | [mesh] | ||
62 | PORT = 10005 | ||
63 | DEBUG = YES | ||
64 | ACCEPT_FROM = 127.0.0.1; | ||
65 | HOSTNAME = localhost | ||
66 | REFRESH_PATH_TIME = 5 s | ||
67 | APP_ANNOUNCE_TIME = 5 s | ||
68 | ID_ANNOUNCE_TIME = 5 s | ||
69 | UNACKNOWLEDGED_WAIT = 2 s | ||
70 | CONNECT_TIMEOUT = 30 s | ||
71 | DEFAULT_TTL = 64 | ||
72 | DHT_REPLICAITON_LEVEL = 10 | ||
73 | # PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp | ||
74 | # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | ||
75 | |||
76 | [testing] | 76 | [testing] |
77 | WEAKRANDOM = YES | 77 | WEAKRANDOM = YES |
78 | 78 | ||
@@ -105,6 +105,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75 | |||
105 | DELETE_FILES = YES | 105 | DELETE_FILES = YES |
106 | 106 | ||
107 | [test_mesh_small] | 107 | [test_mesh_small] |
108 | WAIT_TIME = 300 s | 108 | WAIT_TIME = 30 s |
109 | CONNECTION_LIMIT = 16 | 109 | CONNECTION_LIMIT = 16 |
110 | #DATA_OUTPUT_FILE=data_output | 110 | #DATA_OUTPUT_FILE=data_output |