[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25020 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25020 - gnunet/src/testbed |
Date: |
Fri, 16 Nov 2012 18:11:23 +0100 |
Author: harsha
Date: 2012-11-16 18:11:23 +0100 (Fri, 16 Nov 2012)
New Revision: 25020
Added:
gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
Modified:
gnunet/src/testbed/
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/testbed_api_testbed.c
gnunet/src/testbed/testbed_api_topology.c
Log:
- testcase for 2d torus and fixes
Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed 2012-11-16 17:00:21 UTC (rev 25019)
+++ gnunet/src/testbed 2012-11-16 17:11:23 UTC (rev 25020)
Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -25,3 +25,4 ##
test_testbed_api_testbed_run_topologyclique
test_testbed_api_testbed_run_topologyring
test_testbed_api_testbed_run_topologysmallworldring
+test_testbed_api_testbed_run_topology2dtorus
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2012-11-16 17:00:21 UTC (rev 25019)
+++ gnunet/src/testbed/Makefile.am 2012-11-16 17:11:23 UTC (rev 25020)
@@ -95,7 +95,8 @@
test_testbed_api_testbed_run_topologyline \
test_testbed_api_testbed_run_topologyclique \
test_testbed_api_testbed_run_topologyring \
- test_testbed_api_testbed_run_topologysmallworldring
+ test_testbed_api_testbed_run_topologysmallworldring \
+ test_testbed_api_testbed_run_topology2dtorus
if ENABLE_TEST_RUN
TESTS = \
@@ -114,7 +115,8 @@
test_testbed_api_testbed_run_topologyline \
test_testbed_api_testbed_run_topologyclique \
test_testbed_api_testbed_run_topologyring \
- test_testbed_api_testbed_run_topologysmallworldring
+ test_testbed_api_testbed_run_topologysmallworldring \
+ test_testbed_api_testbed_run_topology2dtorus
endif
test_testbed_api_hosts_SOURCES = \
@@ -218,6 +220,12 @@
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
+test_testbed_api_testbed_run_topology2dtorus_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topology2dtorus_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
EXTRA_DIST = \
test_testbed_api.conf \
test_testbed_api_testbed_run_topologyring.conf \
@@ -225,4 +233,5 @@
test_testbed_api_testbed_run_topologyline.conf \
test_testbed_api_testbed_run_topologyrandom.conf \
test_testbed_api_testbed_run_topologysmallworldring.conf \
+ test_testbed_api_testbed_run_topology2dtorus.conf \
sample_hosts.txt
\ No newline at end of file
Copied: gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
(from rev 25003,
gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf)
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
(rev 0)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2012-11-16 17:11:23 UTC (rev 25020)
@@ -0,0 +1,80 @@
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+NEIGHBOUR_LIMIT = 100
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
+OVERLAY_TOPOLOGY = 2D_TORUS
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[block]
+plugins = dht test
+
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = sqlite
+
+[transport]
+PLUGINS = tcp
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12365
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[core]
+PORT = 12092
+AUTOSTART = YES
+
+[arm]
+DEFAULTSERVICES = core transport
+PORT = 12366
+
+[transport-tcp]
+TIMEOUT = 300 s
+PORT = 12368
+
+[TESTING]
+NUM_PEERS = 5
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+MAX_CONCURRENT_SSH = 10
+USE_PROGRESSBARS = YES
+PEERGROUP_TIMEOUT = 2400 s
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[PATHS]
+SERVICEHOME = /tmp/test-testbed/
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
\ No newline at end of file
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2012-11-16 17:00:21 UTC (rev
25019)
+++ gnunet/src/testbed/testbed_api_testbed.c 2012-11-16 17:11:23 UTC (rev
25020)
@@ -670,6 +670,41 @@
rc->topology = GNUNET_TESTBED_TOPOLOGY_RING;
rc->num_oc = num_peers;
}
+ else if (0 == strcasecmp (topology, "2D_TORUS"))
+ {
+ double sq;
+ unsigned int sq_floor;
+ unsigned int rows;
+ unsigned int *rows_len;
+ unsigned int x;
+ unsigned int y;
+ unsigned int n;
+
+ rc->topology = GNUNET_TESTBED_TOPOLOGY_2D_TORUS;
+ sq = sqrt ((double) num_peers);
+ sq = floor (sq);
+ sq_floor = (unsigned int) sq;
+ rows = (sq_floor + 1);
+ rows_len = GNUNET_malloc (sizeof (unsigned int) * rows);
+ for (y = 0; y < rows - 1; y++)
+ rows_len[y] = sq_floor;
+ n = sq_floor * sq_floor;
+ GNUNET_assert (n <= num_peers);
+ rc->num_oc = 2 * n;
+ x = 0;
+ y = 0;
+ while (n < num_peers)
+ {
+ if (x < y)
+ rows_len[rows - 1] = ++x;
+ else
+ rows_len[y++]++;
+ n++;
+ }
+ rc->num_oc += (x < 2) ? x : 2 * x;
+ rc->num_oc += (y < 2) ? y : 2 * y;
+ GNUNET_free (rows_len);
+ }
else
LOG (GNUNET_ERROR_TYPE_WARNING,
"Unknown topology %s given in configuration\n", topology);
Modified: gnunet/src/testbed/testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/testbed_api_topology.c 2012-11-16 17:00:21 UTC (rev
25019)
+++ gnunet/src/testbed/testbed_api_topology.c 2012-11-16 17:11:23 UTC (rev
25020)
@@ -267,11 +267,14 @@
rows_len[rows - 1] = ++x;
else
rows_len[y++]++;
+ num_peers++;
}
tc->link_array_size += (x < 2) ? x : 2 * x;
tc->link_array_size += (y < 2) ? y : 2 * y;
tc->link_array = GNUNET_malloc (sizeof (struct OverlayLink) *
tc->link_array_size);
+ if (0 == rows_len[rows - 1])
+ rows--;
cnt = 0;
offset = 0;
for (y = 0; y < rows; y++)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25020 - gnunet/src/testbed,
gnunet <=