diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-15 18:41:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-15 18:41:03 +0000 |
commit | 51b6ce1210b50a02ce2466d4c54f69ee273fb55e (patch) | |
tree | aa042a45760780f3c8265f8090f2cececab9a132 /src/ats | |
parent | f8dcb68bc0d257058e26c96aed0a967beda82b6a (diff) | |
download | gnunet-51b6ce1210b50a02ce2466d4c54f69ee273fb55e.tar.gz gnunet-51b6ce1210b50a02ce2466d4c54f69ee273fb55e.zip |
-simplify configs, do use defaults where they work / are identical
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/perf_ats_simplistic_bandwidth.conf | 2 | ||||
-rw-r--r-- | src/ats/test_ats_api.conf | 15 | ||||
-rw-r--r-- | src/ats/test_ats_mlp.conf | 15 | ||||
-rw-r--r-- | src/ats/test_ats_solver_default.conf | 6 | ||||
-rw-r--r-- | src/ats/test_ats_solver_mlp.conf | 3 | ||||
-rw-r--r-- | src/ats/test_ats_solver_proportional.conf | 3 | ||||
-rw-r--r-- | src/ats/test_ats_solver_ril.conf | 3 |
7 files changed, 5 insertions, 42 deletions
diff --git a/src/ats/perf_ats_simplistic_bandwidth.conf b/src/ats/perf_ats_simplistic_bandwidth.conf index 95a0b5894..cec5b36f5 100644 --- a/src/ats/perf_ats_simplistic_bandwidth.conf +++ b/src/ats/perf_ats_simplistic_bandwidth.conf | |||
@@ -24,4 +24,4 @@ WLAN_QUOTA_IN = 128 KiB | |||
24 | WLAN_QUOTA_OUT = 128 KiB | 24 | WLAN_QUOTA_OUT = 128 KiB |
25 | # BLUETOOTH | 25 | # BLUETOOTH |
26 | BLUETOOTH_QUOTA_IN = 128 KiB | 26 | BLUETOOTH_QUOTA_IN = 128 KiB |
27 | BLUETOOTH_QUOTA_OUT = 128 KiB \ No newline at end of file | 27 | BLUETOOTH_QUOTA_OUT = 128 KiB |
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf index ded22b7a2..83e48bc0a 100644 --- a/src/ats/test_ats_api.conf +++ b/src/ats/test_ats_api.conf | |||
@@ -3,22 +3,7 @@ | |||
3 | [PATHS] | 3 | [PATHS] |
4 | GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ | 4 | GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ |
5 | 5 | ||
6 | [arm] | ||
7 | PORT = 12001 | ||
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock | ||
9 | |||
10 | [ats] | 6 | [ats] |
11 | #PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25 | ||
12 | AUTOSTART = YES | ||
13 | PORT = 12002 | ||
14 | HOSTNAME = localhost | ||
15 | BINARY = gnunet-service-ats | ||
16 | ACCEPT_FROM = 127.0.0.1; | ||
17 | ACCEPT_FROM6 = ::1; | ||
18 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-ats.sock | ||
19 | UNIX_MATCH_UID = YES | ||
20 | UNIX_MATCH_GID = YES | ||
21 | |||
22 | # Enable MLP mode (default: NO) | 7 | # Enable MLP mode (default: NO) |
23 | #MODE = RIL | 8 | #MODE = RIL |
24 | MODE = MLP | 9 | MODE = MLP |
diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf index e8862d95d..6a3626850 100644 --- a/src/ats/test_ats_mlp.conf +++ b/src/ats/test_ats_mlp.conf | |||
@@ -1,22 +1,7 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ | 2 | GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ |
3 | 3 | ||
4 | [arm] | ||
5 | PORT = 12001 | ||
6 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock | ||
7 | |||
8 | [ats] | 4 | [ats] |
9 | #PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25 | ||
10 | AUTOSTART = YES | ||
11 | PORT = 12002 | ||
12 | HOSTNAME = localhost | ||
13 | BINARY = gnunet-service-ats | ||
14 | ACCEPT_FROM = 127.0.0.1; | ||
15 | ACCEPT_FROM6 = ::1; | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-ats.sock | ||
17 | UNIX_MATCH_UID = YES | ||
18 | UNIX_MATCH_GID = YES | ||
19 | |||
20 | # Enable MLP mode (default: NO) | 5 | # Enable MLP mode (default: NO) |
21 | MODE = MLP | 6 | MODE = MLP |
22 | # Network specific inbound/outbound quotas | 7 | # Network specific inbound/outbound quotas |
diff --git a/src/ats/test_ats_solver_default.conf b/src/ats/test_ats_solver_default.conf index 6b73d048e..e419c8f35 100644 --- a/src/ats/test_ats_solver_default.conf +++ b/src/ats/test_ats_solver_default.conf | |||
@@ -1,6 +1,2 @@ | |||
1 | [arm] | 1 | @INLINE@ ../../contrib/no_forcestart.conf |
2 | PORT = 12001 | ||
3 | UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock | ||
4 | 2 | ||
5 | [transport] | ||
6 | AUTOSTART = NO | ||
diff --git a/src/ats/test_ats_solver_mlp.conf b/src/ats/test_ats_solver_mlp.conf index 64dadefbf..407b616f8 100644 --- a/src/ats/test_ats_solver_mlp.conf +++ b/src/ats/test_ats_solver_mlp.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_ats_solver_default.conf | 1 | @INLINE@ test_ats_solver_default.conf |
2 | 2 | ||
3 | [ats] | 3 | [ats] |
4 | #PREFIX = valgrind --leak-check=yes | ||
5 | MODE = MLP | 4 | MODE = MLP |
6 | # UNSPECIFIED | 5 | # UNSPECIFIED |
7 | UNSPECIFIED_QUOTA_IN = 64 KiB | 6 | UNSPECIFIED_QUOTA_IN = 64 KiB |
@@ -17,4 +16,4 @@ WAN_QUOTA_IN = 64 KiB | |||
17 | WAN_QUOTA_OUT = 64 KiB | 16 | WAN_QUOTA_OUT = 64 KiB |
18 | # WLAN | 17 | # WLAN |
19 | WLAN_QUOTA_IN = 512 | 18 | WLAN_QUOTA_IN = 512 |
20 | WLAN_QUOTA_OUT = 512 \ No newline at end of file | 19 | WLAN_QUOTA_OUT = 512 |
diff --git a/src/ats/test_ats_solver_proportional.conf b/src/ats/test_ats_solver_proportional.conf index 407dbcb1c..912a419a0 100644 --- a/src/ats/test_ats_solver_proportional.conf +++ b/src/ats/test_ats_solver_proportional.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_ats_solver_default.conf | 1 | @INLINE@ test_ats_solver_default.conf |
2 | 2 | ||
3 | [ats] | 3 | [ats] |
4 | #PREFIX = valgrind --leak-check=yes | ||
5 | MODE = PROPORTIONAL | 4 | MODE = PROPORTIONAL |
6 | # UNSPECIFIED | 5 | # UNSPECIFIED |
7 | UNSPECIFIED_QUOTA_IN = 64 KiB | 6 | UNSPECIFIED_QUOTA_IN = 64 KiB |
@@ -17,4 +16,4 @@ WAN_QUOTA_IN = 64 KiB | |||
17 | WAN_QUOTA_OUT = 64 KiB | 16 | WAN_QUOTA_OUT = 64 KiB |
18 | # WLAN | 17 | # WLAN |
19 | WLAN_QUOTA_IN = 512 | 18 | WLAN_QUOTA_IN = 512 |
20 | WLAN_QUOTA_OUT = 512 \ No newline at end of file | 19 | WLAN_QUOTA_OUT = 512 |
diff --git a/src/ats/test_ats_solver_ril.conf b/src/ats/test_ats_solver_ril.conf index f7b4503a9..fac1a2a30 100644 --- a/src/ats/test_ats_solver_ril.conf +++ b/src/ats/test_ats_solver_ril.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_ats_solver_default.conf | 1 | @INLINE@ test_ats_solver_default.conf |
2 | 2 | ||
3 | [ats] | 3 | [ats] |
4 | #PREFIX = valgrind --leak-check=yes | ||
5 | MODE = RIL | 4 | MODE = RIL |
6 | # UNSPECIFIED | 5 | # UNSPECIFIED |
7 | UNSPECIFIED_QUOTA_IN = 64 KiB | 6 | UNSPECIFIED_QUOTA_IN = 64 KiB |
@@ -28,4 +27,4 @@ RIL_DISCOUNT_BETA = 0.7 | |||
28 | RIL_GRADIENT_STEP_SIZE = 0.3 | 27 | RIL_GRADIENT_STEP_SIZE = 0.3 |
29 | RIL_TRACE_DECAY = 0.2 | 28 | RIL_TRACE_DECAY = 0.2 |
30 | RIL_EXPLORE_RATIO = 0.1 | 29 | RIL_EXPLORE_RATIO = 0.1 |
31 | RIL_GLOBAL_REWARD_SHARE = 1 \ No newline at end of file | 30 | RIL_GLOBAL_REWARD_SHARE = 1 |