diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-06 21:03:33 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-06 21:03:33 +0200 |
commit | 622fd12c7101c53c1fa0f9563a831f3196732dc5 (patch) | |
tree | d86047807232d9921341b8ed84558dea2b9df929 /src/ats-tests | |
parent | 6c38429f96ff9128ebd983a85aa6a2024112ed25 (diff) | |
download | gnunet-622fd12c7101c53c1fa0f9563a831f3196732dc5.tar.gz gnunet-622fd12c7101c53c1fa0f9563a831f3196732dc5.zip |
remove dead, obsolete or never-to-become ATS logic (DCE)
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/Makefile.am | 116 | ||||
-rw-r--r-- | src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.conf | 24 | ||||
-rw-r--r-- | src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.exp | 46 | ||||
-rw-r--r-- | src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.conf | 24 | ||||
-rw-r--r-- | src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.exp | 46 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_mlp_bandwidth.conf | 4 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_mlp_latency.conf | 4 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_mlp_none.conf | 4 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_ril_bandwidth.conf | 4 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_ril_latency.conf | 4 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_ril_none.conf | 4 |
11 files changed, 2 insertions, 278 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 1804a43bf..c965fcc9f 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -9,18 +9,6 @@ if USE_COVERAGE | |||
9 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 9 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
10 | endif | 10 | endif |
11 | 11 | ||
12 | if HAVE_EXPERIMENTAL | ||
13 | if HAVE_LIBGLPK | ||
14 | PERF_MLP = \ | ||
15 | perf_ats_mlp_transport_none \ | ||
16 | perf_ats_mlp_transport_bandwidth \ | ||
17 | perf_ats_mlp_transport_latency \ | ||
18 | perf_ats_mlp_core_none \ | ||
19 | perf_ats_mlp_core_bandwidth \ | ||
20 | perf_ats_mlp_core_latency | ||
21 | endif | ||
22 | endif | ||
23 | |||
24 | if HAVE_TESTING | 12 | if HAVE_TESTING |
25 | TESTING_TESTS = \ | 13 | TESTING_TESTS = \ |
26 | perf_ats_proportional_transport_none \ | 14 | perf_ats_proportional_transport_none \ |
@@ -31,8 +19,6 @@ TESTING_TESTS = \ | |||
31 | perf_ats_proportional_core_latency \ | 19 | perf_ats_proportional_core_latency \ |
32 | $(PERF_MLP) | 20 | $(PERF_MLP) |
33 | 21 | ||
34 | # RIL-tests commented out as RIL is currently badly broken. | ||
35 | # perf_ats_ril_transport_none perf_ats_ril_core_none perf_ats_ril_transport_bandwidth perf_ats_ril_core_bandwidth perf_ats_ril_transport_latency perf_ats_ril_core_latency | ||
36 | endif | 22 | endif |
37 | 23 | ||
38 | lib_LTLIBRARIES = \ | 24 | lib_LTLIBRARIES = \ |
@@ -56,7 +42,7 @@ libgnunetatstesting_la_SOURCES = \ | |||
56 | libgnunetatstesting_la_LIBADD = \ | 42 | libgnunetatstesting_la_LIBADD = \ |
57 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 43 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
58 | $(top_builddir)/src/core/libgnunetcore.la \ | 44 | $(top_builddir)/src/core/libgnunetcore.la \ |
59 | $(top_builddir)/src/transport/libgnunettransport.la \ | 45 | $(top_builddir)/src/transport/libgnunettransport.la \ |
60 | $(top_builddir)/src/ats/libgnunetats.la \ | 46 | $(top_builddir)/src/ats/libgnunetats.la \ |
61 | $(top_builddir)/src/util/libgnunetutil.la \ | 47 | $(top_builddir)/src/util/libgnunetutil.la \ |
62 | $(GN_LIBINTL) | 48 | $(GN_LIBINTL) |
@@ -168,106 +154,8 @@ perf_ats_proportional_transport_latency_DEPENDENCIES = \ | |||
168 | libgnunetatstesting.la \ | 154 | libgnunetatstesting.la \ |
169 | $(top_builddir)/src/util/libgnunetutil.la | 155 | $(top_builddir)/src/util/libgnunetutil.la |
170 | 156 | ||
171 | perf_ats_mlp_core_none_SOURCES = \ | ||
172 | perf_ats.c | ||
173 | perf_ats_mlp_core_none_LDADD = \ | ||
174 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
175 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
176 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
177 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
178 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
179 | $(top_builddir)/src/transport/libgnunettransport.la | ||
180 | perf_ats_mlp_core_none_DEPENDENCIES = \ | ||
181 | libgnunetatstesting.la \ | ||
182 | $(top_builddir)/src/util/libgnunetutil.la | ||
183 | |||
184 | perf_ats_mlp_transport_none_SOURCES = \ | ||
185 | perf_ats.c | ||
186 | perf_ats_mlp_transport_none_LDADD = \ | ||
187 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
188 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
189 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
190 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
191 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
192 | $(top_builddir)/src/transport/libgnunettransport.la | ||
193 | perf_ats_mlp_transport_none_DEPENDENCIES = \ | ||
194 | libgnunetatstesting.la \ | ||
195 | $(top_builddir)/src/util/libgnunetutil.la | ||
196 | |||
197 | perf_ats_mlp_core_bandwidth_SOURCES = \ | ||
198 | perf_ats.c | ||
199 | perf_ats_mlp_core_bandwidth_LDADD = \ | ||
200 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
201 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
202 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
203 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
204 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
205 | $(top_builddir)/src/transport/libgnunettransport.la | ||
206 | perf_ats_mlp_core_bandwidth_DEPENDENCIES = \ | ||
207 | libgnunetatstesting.la \ | ||
208 | $(top_builddir)/src/util/libgnunetutil.la | ||
209 | |||
210 | perf_ats_mlp_transport_bandwidth_SOURCES = \ | ||
211 | perf_ats.c | ||
212 | perf_ats_mlp_transport_bandwidth_LDADD = \ | ||
213 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
214 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
215 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
216 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
217 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
218 | $(top_builddir)/src/transport/libgnunettransport.la | ||
219 | perf_ats_mlp_transport_bandwidth_DEPENDENCIES = \ | ||
220 | libgnunetatstesting.la \ | ||
221 | $(top_builddir)/src/util/libgnunetutil.la | ||
222 | |||
223 | perf_ats_mlp_core_latency_SOURCES = \ | ||
224 | perf_ats.c | ||
225 | perf_ats_mlp_core_latency_LDADD = \ | ||
226 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
227 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
228 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
229 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
230 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
231 | $(top_builddir)/src/transport/libgnunettransport.la | ||
232 | perf_ats_mlp_core_latency_DEPENDENCIES = \ | ||
233 | libgnunetatstesting.la \ | ||
234 | $(top_builddir)/src/util/libgnunetutil.la | ||
235 | |||
236 | perf_ats_mlp_transport_latency_SOURCES = \ | ||
237 | perf_ats.c | ||
238 | perf_ats_mlp_transport_latency_LDADD = \ | ||
239 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
240 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
241 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
242 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
243 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
244 | $(top_builddir)/src/transport/libgnunettransport.la | ||
245 | perf_ats_mlp_transport_latencyDEPENDENCIES = \ | ||
246 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
247 | $(top_builddir)/src/util/libgnunetutil.la | ||
248 | |||
249 | #perf_ats_ril_core_none_SOURCES = \ | ||
250 | # perf_ats.c | ||
251 | #perf_ats_ril_core_none_LDADD = \ | ||
252 | # $(top_builddir)/src/util/libgnunetutil.la \ | ||
253 | # $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | ||
254 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
255 | # $(top_builddir)/src/ats/libgnunetats.la \ | ||
256 | # $(top_builddir)/src/core/libgnunetcore.la \ | ||
257 | # $(top_builddir)/src/transport/libgnunettransport.la | ||
258 | #perf_ats_ril_core_none_DEPENDENCIES = \ | ||
259 | # libgnunetatstesting.la \ | ||
260 | # $(top_builddir)/src/util/libgnunetutil.la | ||
261 | |||
262 | |||
263 | EXTRA_DIST = \ | 157 | EXTRA_DIST = \ |
264 | gnunet_ats_sim_default.conf \ | 158 | gnunet_ats_sim_default.conf \ |
265 | perf_ats_proportional_none.conf \ | 159 | perf_ats_proportional_none.conf \ |
266 | perf_ats_proportional_bandwidth.conf \ | 160 | perf_ats_proportional_bandwidth.conf \ |
267 | perf_ats_proportional_latency.conf \ | 161 | perf_ats_proportional_latency.conf |
268 | perf_ats_mlp_none.conf \ | ||
269 | perf_ats_mlp_bandwidth.conf \ | ||
270 | perf_ats_mlp_latency.conf \ | ||
271 | perf_ats_ril_none.conf \ | ||
272 | perf_ats_ril_bandwidth.conf \ | ||
273 | perf_ats_ril_latency.conf | ||
diff --git a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.conf b/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.conf deleted file mode 100644 index 91697eda9..000000000 --- a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.conf +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [transport] | ||
4 | plugins = unix | ||
5 | |||
6 | [ats] | ||
7 | MODE = PROPORTIONAL | ||
8 | UNSPECIFIED_QUOTA_IN = 128 KiB | ||
9 | UNSPECIFIED_QUOTA_OUT = 128 KiB | ||
10 | # LOOPBACK | ||
11 | LOOPBACK_QUOTA_IN = 128 KiB | ||
12 | LOOPBACK_QUOTA_OUT = 128 KiB | ||
13 | # LAN | ||
14 | LAN_QUOTA_IN = 128 KiB | ||
15 | LAN_QUOTA_OUT = 128 KiB | ||
16 | # WAN | ||
17 | WAN_QUOTA_IN = 128 KiB | ||
18 | WAN_QUOTA_OUT = 128 KiB | ||
19 | # WLAN | ||
20 | WLAN_QUOTA_IN = 128 KiB | ||
21 | WLAN_QUOTA_OUT = 128 KiB | ||
22 | # BLUETOOTH | ||
23 | BLUETOOTH_QUOTA_IN = 128 KiB | ||
24 | BLUETOOTH_QUOTA_OUT = 128 KiB \ No newline at end of file | ||
diff --git a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.exp b/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.exp deleted file mode 100644 index 9b4c998c4..000000000 --- a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.exp +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | [experiment] | ||
2 | name = sc1_eval_dru_mlp | ||
3 | masters = 1 | ||
4 | slaves = 3 | ||
5 | max_duration = 20 s | ||
6 | log_freq = 100 ms | ||
7 | cfg_file = experiments/evaluation1_dru_3_peers_1addr_1scope_mlp.conf | ||
8 | |||
9 | [episode-0] | ||
10 | # operations = start_send, stop_send, start_preference, stop_preference | ||
11 | duration = 1 s | ||
12 | op-0-operation = start_send | ||
13 | op-0-src = 0 | ||
14 | op-0-dest = 0 | ||
15 | op-0-type = constant | ||
16 | #op-0-period = 10 s | ||
17 | op-0-base-rate= 10000 | ||
18 | #op-0-max-rate = 10000 | ||
19 | |||
20 | op-1-operation = start_send | ||
21 | op-1-src = 0 | ||
22 | op-1-dest = 1 | ||
23 | op-1-type = constant | ||
24 | #op-1-period = 10 s | ||
25 | op-1-base-rate= 10000 | ||
26 | #op-1-max-rate = 10000 | ||
27 | |||
28 | op-2-operation = start_send | ||
29 | op-2-src = 0 | ||
30 | op-2-dest = 2 | ||
31 | op-2-type = constant | ||
32 | #op-1-period = 10 s | ||
33 | op-2-base-rate= 10000 | ||
34 | #op-1-max-rate = 10000 | ||
35 | |||
36 | [episode-1] | ||
37 | duration = 1 s | ||
38 | op-0-operation = start_preference | ||
39 | op-0-src = 0 | ||
40 | op-0-dest = 2 | ||
41 | op-0-type = constant | ||
42 | #op-0-period = 10 s | ||
43 | op-0-pref = bandwidth | ||
44 | op-0-frequency = 1 s | ||
45 | op-0-base-rate= 50 | ||
46 | #op-0-max-rate = 10000 \ No newline at end of file | ||
diff --git a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.conf b/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.conf deleted file mode 100644 index 4b66e5aea..000000000 --- a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.conf +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [transport] | ||
4 | plugins = unix | ||
5 | |||
6 | [ats] | ||
7 | MODE = MLP | ||
8 | UNSPECIFIED_QUOTA_IN = 128 KiB | ||
9 | UNSPECIFIED_QUOTA_OUT = 128 KiB | ||
10 | # LOOPBACK | ||
11 | LOOPBACK_QUOTA_IN = 128 KiB | ||
12 | LOOPBACK_QUOTA_OUT = 128 KiB | ||
13 | # LAN | ||
14 | LAN_QUOTA_IN = 128 KiB | ||
15 | LAN_QUOTA_OUT = 128 KiB | ||
16 | # WAN | ||
17 | WAN_QUOTA_IN = 128 KiB | ||
18 | WAN_QUOTA_OUT = 128 KiB | ||
19 | # WLAN | ||
20 | WLAN_QUOTA_IN = 128 KiB | ||
21 | WLAN_QUOTA_OUT = 128 KiB | ||
22 | # BLUETOOTH | ||
23 | BLUETOOTH_QUOTA_IN = 128 KiB | ||
24 | BLUETOOTH_QUOTA_OUT = 128 KiB \ No newline at end of file | ||
diff --git a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.exp b/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.exp deleted file mode 100644 index 280b1605c..000000000 --- a/src/ats-tests/experiments/evaluation1_dru_3_peers_1addr_1scope_ril.exp +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | [experiment] | ||
2 | name = sc1_eval_dru_ril | ||
3 | masters = 1 | ||
4 | slaves = 3 | ||
5 | max_duration = 20 s | ||
6 | log_freq = 100 ms | ||
7 | cfg_file = experiments/evaluation1_dru_3_peers_1addr_1scope_ril.conf | ||
8 | |||
9 | [episode-0] | ||
10 | # operations = start_send, stop_send, start_preference, stop_preference | ||
11 | duration = 10 s | ||
12 | op-0-operation = start_send | ||
13 | op-0-src = 0 | ||
14 | op-0-dest = 0 | ||
15 | op-0-type = constant | ||
16 | #op-0-period = 10 s | ||
17 | op-0-base-rate= 10000 | ||
18 | #op-0-max-rate = 10000 | ||
19 | |||
20 | op-1-operation = start_send | ||
21 | op-1-src = 0 | ||
22 | op-1-dest = 1 | ||
23 | op-1-type = constant | ||
24 | #op-1-period = 10 s | ||
25 | op-1-base-rate= 10000 | ||
26 | #op-1-max-rate = 10000 | ||
27 | |||
28 | op-2-operation = start_send | ||
29 | op-2-src = 0 | ||
30 | op-2-dest = 2 | ||
31 | op-2-type = constant | ||
32 | #op-1-period = 10 s | ||
33 | op-2-base-rate= 10000 | ||
34 | #op-1-max-rate = 10000 | ||
35 | |||
36 | [episode-1] | ||
37 | duration = 10 s | ||
38 | op-0-operation = start_preference | ||
39 | op-0-src = 0 | ||
40 | op-0-dest = 2 | ||
41 | op-0-type = constant | ||
42 | #op-0-period = 10 s | ||
43 | op-0-pref = bandwidth | ||
44 | op-0-frequency = 1 s | ||
45 | op-0-base-rate= 50 | ||
46 | #op-0-max-rate = 10000 \ No newline at end of file | ||
diff --git a/src/ats-tests/perf_ats_mlp_bandwidth.conf b/src/ats-tests/perf_ats_mlp_bandwidth.conf deleted file mode 100644 index b803d683d..000000000 --- a/src/ats-tests/perf_ats_mlp_bandwidth.conf +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [ats] | ||
4 | MODE = mlp | ||
diff --git a/src/ats-tests/perf_ats_mlp_latency.conf b/src/ats-tests/perf_ats_mlp_latency.conf deleted file mode 100644 index b803d683d..000000000 --- a/src/ats-tests/perf_ats_mlp_latency.conf +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [ats] | ||
4 | MODE = mlp | ||
diff --git a/src/ats-tests/perf_ats_mlp_none.conf b/src/ats-tests/perf_ats_mlp_none.conf deleted file mode 100644 index b803d683d..000000000 --- a/src/ats-tests/perf_ats_mlp_none.conf +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [ats] | ||
4 | MODE = mlp | ||
diff --git a/src/ats-tests/perf_ats_ril_bandwidth.conf b/src/ats-tests/perf_ats_ril_bandwidth.conf deleted file mode 100644 index 3e7969a84..000000000 --- a/src/ats-tests/perf_ats_ril_bandwidth.conf +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [ats] | ||
4 | MODE = ril | ||
diff --git a/src/ats-tests/perf_ats_ril_latency.conf b/src/ats-tests/perf_ats_ril_latency.conf deleted file mode 100644 index 3e7969a84..000000000 --- a/src/ats-tests/perf_ats_ril_latency.conf +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [ats] | ||
4 | MODE = ril | ||
diff --git a/src/ats-tests/perf_ats_ril_none.conf b/src/ats-tests/perf_ats_ril_none.conf deleted file mode 100644 index 3e7969a84..000000000 --- a/src/ats-tests/perf_ats_ril_none.conf +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | @INLINE@ template_perf_ats.conf | ||
2 | |||
3 | [ats] | ||
4 | MODE = ril | ||