benchmarking script + config files

diff --git a/src/transport/ats_benchmark.sh b/src/transport/ats_benchmark.sh
index f2df8a879af8b4257587be10aaefa05fd8c6758b..82ba2cbed508f2cdbb3141dcffd190bde7c9c869 100755 (executable)
--- a/src/transport/ats_benchmark.sh
+++ b/src/transport/ats_benchmark.sh
@@ -1,7 +1,10 @@
 #/bin/bash
 start=1
 end=500
-rm test.ats
+
+rm bench_1addr.ats
+rm bench_2addr.ats
+rm bench_4addr.ats
 
 if [ ! $1 = "" ]; then
   start=$1
@@ -21,6 +24,31 @@ do
   killall -s 31 gnunet-service-core 2> /dev/null
   killall -s 31 gnunet-service-peerinfo 2> /dev/null
   #sleep 1
-  echo "$c peers"
-  ./test_transport_ats $c 2>> test.ats
+  echo "$c peers, 4 addr/peer"
+  ./test_transport_ats -c test_transport_ats_4addr.conf -m -p $c 2>> bench_4addr.ats
+  rm -rf /tmp/test-gnunet-testing
+  killall -s 31 gnunet-service-arm 2> /dev/null
+  killall -s 31 gnunet-service-transport 2> /dev/null
+  killall -s 31 gnunet-service-statistics 2> /dev/null
+  killall -s 31 gnunet-service-resolver 2> /dev/null
+  killall -s 31 gnunet-service-core 2> /dev/null
+  killall -s 31 gnunet-service-peerinfo 2> /dev/null
+  echo "$c peers, 2 addr/peer"
+  ./test_transport_ats -c test_transport_ats_2addr.conf -m -p $c 2>> bench_2addr.ats
+  rm -rf /tmp/test-gnunet-testing
+  killall -s 31 gnunet-service-arm 2> /dev/null
+  killall -s 31 gnunet-service-transport 2> /dev/null
+  killall -s 31 gnunet-service-statistics 2> /dev/null
+  killall -s 31 gnunet-service-resolver 2> /dev/null
+  killall -s 31 gnunet-service-core 2> /dev/null
+  killall -s 31 gnunet-service-peerinfo 2> /dev/null
+  echo "$c peers, 1 addr/peer"
+  ./test_transport_ats -c test_transport_ats_1addr.conf -m -p $c 2>> bench_1addr.ats
+  rm -rf /tmp/test-gnunet-testing
+  killall -s 31 gnunet-service-arm 2> /dev/null
+  killall -s 31 gnunet-service-transport 2> /dev/null
+  killall -s 31 gnunet-service-statistics 2> /dev/null
+  killall -s 31 gnunet-service-resolver 2> /dev/null
+  killall -s 31 gnunet-service-core 2> /dev/null
+  killall -s 31 gnunet-service-peerinfo 2> /dev/null
 done

diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf
new file mode 100644 (file)
index 0000000..316841b
--- /dev/null
+++ b/src/transport/test_transport_ats_1addr.conf
@@ -0,0 +1,66 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-testing/
+DEFAULTCONFIG = test_testing_data.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+PORT = 2565
+PLUGINS = unix
+#DEBUG = YES
+#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#WAN_BW_LIMIT_DOWN = 100
+#WAN_BW_LIMIT_UP = 1000000
+#LAN_BW_LIMIT_DOWN = 100
+#LAN_BW_LIMIT_UP = 100000000
+#WLAN_ENERGY_DOWN_LIMIT = 0
+#WLAN_ENERGY_UP_LIMIT = 30
+#DUMP_MLP = YES
+#DUMP_SOLUTION = YES
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES = core
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+#DEBUG=YES
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+ENABLE_UPNP = NO
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+
+[transport-unix]
+PORT = 2572
+
+
+[transport-udp]
+PORT = 2571
+
+[peerinfo]
+PORT = 2569
+
+[core]
+PORT = 2570
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+

diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
new file mode 100644 (file)
index 0000000..9524ebd
--- /dev/null
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -0,0 +1,66 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-testing/
+DEFAULTCONFIG = test_testing_data.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+PORT = 2565
+PLUGINS = unix udp
+#DEBUG = YES
+#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#WAN_BW_LIMIT_DOWN = 100
+#WAN_BW_LIMIT_UP = 1000000
+#LAN_BW_LIMIT_DOWN = 100
+#LAN_BW_LIMIT_UP = 100000000
+#WLAN_ENERGY_DOWN_LIMIT = 0
+#WLAN_ENERGY_UP_LIMIT = 30
+#DUMP_MLP = YES
+#DUMP_SOLUTION = YES
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES = core
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+#DEBUG=YES
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+ENABLE_UPNP = NO
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+
+[transport-unix]
+PORT = 2572
+
+
+[transport-udp]
+PORT = 2571
+
+[peerinfo]
+PORT = 2569
+
+[core]
+PORT = 2570
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+

diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf
new file mode 100644 (file)
index 0000000..7458183
--- /dev/null
+++ b/src/transport/test_transport_ats_4addr.conf
@@ -0,0 +1,66 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-testing/
+DEFAULTCONFIG = test_testing_data.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+PORT = 2565
+PLUGINS = tcp
+#DEBUG = YES
+#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#WAN_BW_LIMIT_DOWN = 100
+#WAN_BW_LIMIT_UP = 1000000
+#LAN_BW_LIMIT_DOWN = 100
+#LAN_BW_LIMIT_UP = 100000000
+#WLAN_ENERGY_DOWN_LIMIT = 0
+#WLAN_ENERGY_UP_LIMIT = 30
+#DUMP_MLP = YES
+#DUMP_SOLUTION = YES
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES = core
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+#DEBUG=YES
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+ENABLE_UPNP = NO
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+
+[transport-unix]
+PORT = 2572
+
+
+[transport-udp]
+PORT = 2571
+
+[peerinfo]
+PORT = 2569
+
+[core]
+PORT = 2570
+
+[testing]
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+