diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-16 13:08:10 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-16 13:08:10 +0000 |
commit | 58857960c4d0329b1e19636b07672db320b24ec0 (patch) | |
tree | 271cb5942cac6566e4f7712dfae5cee5cfe38486 /src | |
parent | 8e13c09bafa9ef36c83955f82d883d47e597ca78 (diff) | |
download | gnunet-58857960c4d0329b1e19636b07672db320b24ec0.tar.gz gnunet-58857960c4d0329b1e19636b07672db320b24ec0.zip |
-reducing testing peers and links
Diffstat (limited to 'src')
9 files changed, 9 insertions, 14 deletions
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index dc6116d71..6f2a5c950 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
@@ -4,7 +4,7 @@ PORT = 12113 | |||
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | NEIGHBOUR_LIMIT = 100 | 6 | NEIGHBOUR_LIMIT = 100 |
7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 | 7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 |
8 | TOPOLOGY = RANDOM | 8 | TOPOLOGY = RANDOM |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
10 | 10 | ||
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index 2559523e6..349dc4923 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -31,7 +31,7 @@ | |||
31 | /** | 31 | /** |
32 | * Number of peers we want to start | 32 | * Number of peers we want to start |
33 | */ | 33 | */ |
34 | #define NUM_PEERS 13 | 34 | #define NUM_PEERS 5 |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * The array of peers; we fill this as the peers are given to us by the testbed | 37 | * The array of peers; we fill this as the peers are given to us by the testbed |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf index 3eb136e1c..b4c7f9f16 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf | |||
@@ -4,7 +4,7 @@ PORT = 12113 | |||
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | NEIGHBOUR_LIMIT = 100 | 6 | NEIGHBOUR_LIMIT = 100 |
7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 | 7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 |
8 | OVERLAY_TOPOLOGY = CLIQUE | 8 | OVERLAY_TOPOLOGY = CLIQUE |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
10 | 10 | ||
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf index 53d0e6f4c..0e362bf48 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf | |||
@@ -4,7 +4,7 @@ PORT = 12113 | |||
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | NEIGHBOUR_LIMIT = 100 | 6 | NEIGHBOUR_LIMIT = 100 |
7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 | 7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 1 |
8 | OVERLAY_TOPOLOGY = LINE | 8 | OVERLAY_TOPOLOGY = LINE |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
10 | 10 | ||
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf index cd2913832..ca2466af1 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf | |||
@@ -3,7 +3,7 @@ AUTOSTART = NO | |||
3 | PORT = 12113 | 3 | PORT = 12113 |
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 | 6 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 |
7 | OVERLAY_TOPOLOGY = RANDOM | 7 | OVERLAY_TOPOLOGY = RANDOM |
8 | OVERLAY_RANDOM_LINKS = 5 | 8 | OVERLAY_RANDOM_LINKS = 5 |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf index ade5df346..a060a6386 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf | |||
@@ -4,7 +4,7 @@ PORT = 12113 | |||
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | NEIGHBOUR_LIMIT = 100 | 6 | NEIGHBOUR_LIMIT = 100 |
7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 | 7 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 |
8 | OVERLAY_TOPOLOGY = RING | 8 | OVERLAY_TOPOLOGY = RING |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
10 | 10 | ||
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf index e16c30832..6317cb833 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf | |||
@@ -3,9 +3,9 @@ AUTOSTART = NO | |||
3 | PORT = 12113 | 3 | PORT = 12113 |
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 | 6 | MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 |
7 | OVERLAY_TOPOLOGY = SMALL_WORLD_RING | 7 | OVERLAY_TOPOLOGY = SMALL_WORLD_RING |
8 | OVERLAY_RANDOM_LINKS = 5 | 8 | OVERLAY_RANDOM_LINKS = 3 |
9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 9 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
10 | 10 | ||
11 | [fs] | 11 | [fs] |
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index f456c49c7..7166bf266 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c | |||
@@ -31,7 +31,7 @@ | |||
31 | /** | 31 | /** |
32 | * Number of peers we want to start | 32 | * Number of peers we want to start |
33 | */ | 33 | */ |
34 | #define NUM_PEERS 50 | 34 | #define NUM_PEERS 10 |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * Array of peers | 37 | * Array of peers |
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 34afae883..83687f337 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -102,11 +102,6 @@ controller_event_cb (void *cls, | |||
102 | break; | 102 | break; |
103 | default: | 103 | default: |
104 | GNUNET_break (0); | 104 | GNUNET_break (0); |
105 | if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && | ||
106 | (NULL != event->details.operation_finished.emsg)) | ||
107 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
108 | "An operation failed with error: %s\n", | ||
109 | event->details.operation_finished.emsg); | ||
110 | result = GNUNET_SYSERR; | 105 | result = GNUNET_SYSERR; |
111 | GNUNET_SCHEDULER_cancel (shutdown_task); | 106 | GNUNET_SCHEDULER_cancel (shutdown_task); |
112 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 107 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |