refactor DHT for new service API

[oweals/gnunet.git] / src / nse / nse_profiler_test.conf

diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 0185ed2173eb24ddf8614f371ffa994a53203226..b118132d174ae5219355370b4142c6da3ac983af 100644 (file)
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -1,47 +1,28 @@
 [PATHS]
-SERVICEHOME = /tmp/nse-profiler/
-DEFAULTCONFIG = nse_profiler_test.conf
+GNUNET_TEST_HOME = /tmp/nse-profiler/
+
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
+HOSTNAME = localhost
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
+OVERLAY_TOPOLOGY = RANDOM
+OVERLAY_RANDOM_LINKS = 1000
+OPERATION_TIMEOUT = 45 s
 
 [nse]
-PORT = 0
-UNIXPATH = /tmp/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
+FORCESTART = YES
 AUTOSTART = NO
-DEBUG = YES
-CONFIG = $DEFAULTCONFIG
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
-INTERVAL = 30 s
+INTERVAL = 10 s
 WORKBITS = 0
-PROOFFILE = $SERVICEHOME/nse.proof
-
-[arm]
-PORT = 0
-DEFAULTSERVICES = core
-UNIXPATH = /tmp/test-nse-service-arm.unix
-#DEBUG = YES
-
-[statistics]
-AUTOSTART = YES
-PORT=0
-
-[fs]
-AUTOSTART = NO
-PORT=0
-
-[datastore]
-AUTOSTART = NO
-PORT = 0
-
-[dht]
-AUTOSTART = NO
-PORT = 0
+PROOFFILE = $GNUNET_TEST_HOME/nse.proof
 
 [nat]
-DISABLEV6 = YES 
+DISABLEV6 = YES
 BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
@@ -50,102 +31,23 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [transport]
-PORT = 0
-plugins = unix
-
-[transport-unix]
-PORT = 1
-
-[transport-tcp]
-PORT = 0
-
-[transport-udp]
-PORT = 0
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
-
-[core]
-AUTOSTART = YES
-PORT = 0
-
-[peerinfo]
-AUTOSTART = YES
-PORT = 0
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-PORT = 0
-
-[ats]
-PORT = 0
-
-[mesh]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[testing]
-NUM_PEERS = 4000
-WEAKRANDOM = YES
-TOPOLOGY = NONE
-#CONNECT_TOPOLOGY = SMALL_WORLD_RING
-CONNECT_TOPOLOGY = ERDOS_RENYI
-CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-CONNECT_TOPOLOGY_OPTION_MODIFIER = 5
-# PERCENTAGE = 3
-PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 360 s
-CONNECT_ATTEMPTS = 3
-DEBUG = YES
-#HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-HOSTKEYSFILE = hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-TOPOLOGY_OUTPUT_FILE = nse_topo_4000_peers_initial
-MAX_OUTSTANDING_CONNECTIONS = 100
-#SINGLE_PEERINFO_PER_HOST = YES
-#NUM_PEERINFO_PER_HOST = 10
-#SINGLE_STATISTICS_PER_HOST = YES
-#NUM_STATISTICS_PER_HOST = 10
-DELETE_FILES = NO
-#SKEW_VARIANCE = 30000
+plugins = udp
 
 [nse-profiler]
-OUTPUT_FILE = nse_output_4000_peers.dat
-TOPOLOGY_OUTPUT_FILE = nse_topo_4000_peers
-DATA_OUTPUT_FILE = nse_stats_4000_peers
+OUTPUT_FILE = nse_output_2000_peers.dat
+TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
+DATA_OUTPUT_FILE = nse_stats_2000_peers
 ROUND0 = 1000
-#ROUND1 = 4000
-ROUND2 = 4000
-ROUND3 = 4000
-ROUND4 = 4000
-ROUND5 = 4000
-ROUND6 = 4000
-ROUND7 = 4000
-ROUND8 = 4000
-ROUND9 = 4000
-ROUND10 = 4000
+#ROUND1 = 2000
+ROUND2 = 2000
+ROUND3 = 2000
+ROUND4 = 2000
+ROUND5 = 2000
+ROUND6 = 2000
+ROUND7 = 2000
+ROUND8 = 2000
+ROUND9 = 2000
+ROUND10 = 2000
 ROUND11 = 1000
 ROUND12 = 1000
 ROUND13 = 1000