1 files changed, 27 insertions, 17 deletions

diff --git a/contrib/regex_profiler_infiniband.conf b/contrib/regex_profiler_infiniband.conf
index 556aeccfb..9749a1a87 100644
--- a/contrib/regex_profiler_infiniband.conf
+++ b/contrib/regex_profiler_infiniband.conf
@@ -3,48 +3,55 @@ AUTOSTART = NO
 PORT = 11999
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 20
-MAX_PARALLEL_OPERATIONS = 1000
-MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
-MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 50
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 25
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
+#MAX_PARALLEL_OPERATIONS = 1000
+#MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
 
 [regexprofiler]
 BINARY = /home/szengel/gnunet/src/mesh/.libs/gnunet-daemon-regexprofiler
 REGEX_PREFIX = "GNVPN-0001-PAD"
-ANNOUNCE_DELAY = 500 ms
 
 [mesh]
 AUTOSTART = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-APP_ANNOUNCE_TIME = 60 s
-ID_ANNOUNCE_TIME = 60 s
+APP_ANNOUNCE_TIME = 240 s
+ID_ANNOUNCE_TIME = 120 m
 CONNECT_TIMEOUT = 30 s
 PORT = 12001
-DHT_REPLICATION_LEVEL = 10
+DHT_REPLICATION_LEVEL = 3
 
 [dht]
 AUTOSTART = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-#PORT = 12002
 HOSTNAME = localhost
+# Do not allow DHT to create extra connections, beyond those testbed created
 DISABLE_TRY_CONNECT = NO
+FORCE_NSE = 1
 
 [dhtcache]
-DATABASE = sqlite
-QUOTA = 1000 MB
+DATABASE = heap
+QUOTA = 100 MB
+# Disable RC-file for Bloom filter?  (for benchmarking with limited IO availability)
+DISABLE_BF_RC = YES
+DISABLE_BF = YES
+
+[datacache-sqlite]
+# Keep datacache in-memory? (reduces IO)
+IN_MEMORY = YES
 
 [arm]
 DEFAULTSERVICES = core mesh dht statistics regexprofiler
-#PORT = 12003
 
 [fs]
 AUTOSTART = NO
 
 [resolver]
 AUTOSTART = NO
+HOSTNAME = localhost
 
-#[block]
-#plugins = dht mesh
+[block]
+plugins = dht mesh
 
 [transport]
 AUTOSTART = YES
@@ -52,14 +59,13 @@ PLUGINS = tcp
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 ACCEPT_FROM6 = ::1;
 NEIGHBOUR_LIMIT = 50
-PORT = 12004
+#PORT = 12004
 
 [ats]
 WAN_QUOTA_OUT = 3932160
 WAN_QUOTA_IN = 3932160
 
 [core]
-#PORT = 12005
 AUTOSTART = YES
 
 [transport-tcp]
@@ -76,6 +82,7 @@ ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 PORT = 12008
 AUTOSTART = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+DISABLE = NO
 
 [TESTING]
 NUM_PEERS = 5
@@ -89,18 +96,21 @@ PEERGROUP_TIMEOUT = 2400 s
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-testbed/
+SERVICEHOME = /tmp/perf-regex/
 
 [dns]
 AUTOSTART = NO
 
 [nse]
 AUTOSTART = YES
+# Minimize proof-of-work CPU consumption by NSE
 WORKBITS = 1
 
 [vpn]
 AUTOSTART = NO
 
 [nat]
+# Allow running on systems with only loopback?
 RETURN_LOCAL_ADDRESSES = YES
+# Disable redundant addresses...
 DISABLEV6 = YES