diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-26 11:02:56 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-26 11:02:56 +0000 |
commit | cae939e36905db9f2eb38c5699ff45b5d2965de9 (patch) | |
tree | 8d0119a44ecffc3dc47023822eb5a8fc873eef16 /src/ats | |
parent | 9644bcee56055bbf5e1d90c1d6963d1ce7f818cc (diff) | |
download | gnunet-cae939e36905db9f2eb38c5699ff45b5d2965de9.tar.gz gnunet-cae939e36905db9f2eb38c5699ff45b5d2965de9.zip |
updated configuration files
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/Makefile.am | 15 | ||||
-rw-r--r-- | src/ats/test_ats_solver_mlp.conf | 18 | ||||
-rw-r--r-- | src/ats/test_ats_solver_proportional.conf | 18 | ||||
-rw-r--r-- | src/ats/test_ats_solver_ril.conf | 18 |
4 files changed, 64 insertions, 5 deletions
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index d280a1ab0..b6032aede 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am | |||
@@ -22,6 +22,7 @@ if HAVE_LIBGLPK | |||
22 | GN_MLP_TEST_UPDATE = test_ats_mlp_update | 22 | GN_MLP_TEST_UPDATE = test_ats_mlp_update |
23 | GN_MLP_TEST_AVG = test_ats_mlp_averaging | 23 | GN_MLP_TEST_AVG = test_ats_mlp_averaging |
24 | GN_MLP_PERF = perf_ats_mlp | 24 | GN_MLP_PERF = perf_ats_mlp |
25 | GN_MLP_ADDRESS = test_ats_solver_add_address_mlp | ||
25 | endif | 26 | endif |
26 | 27 | ||
27 | lib_LTLIBRARIES = libgnunetats.la | 28 | lib_LTLIBRARIES = libgnunetats.la |
@@ -77,7 +78,7 @@ TESTING_TESTS = \ | |||
77 | test_ats_api_performance_monitor \ | 78 | test_ats_api_performance_monitor \ |
78 | test_ats_api_performance_monitor_initial_callback \ | 79 | test_ats_api_performance_monitor_initial_callback \ |
79 | test_ats_solver_add_address_proportional \ | 80 | test_ats_solver_add_address_proportional \ |
80 | test_ats_solver_add_address_mlp \ | 81 | $(GN_MLP_ADDRESS) \ |
81 | test_ats_solver_add_address_ril | 82 | test_ats_solver_add_address_ril |
82 | # test_ats_api_scheduling_min_bw | 83 | # test_ats_api_scheduling_min_bw |
83 | # test_ats_api_scheduling_check_min_bw_alt | 84 | # test_ats_api_scheduling_check_min_bw_alt |
@@ -231,6 +232,7 @@ test_ats_solver_add_address_proportional_LDADD = \ | |||
231 | $(top_builddir)/src/ats/libgnunetats.la \ | 232 | $(top_builddir)/src/ats/libgnunetats.la \ |
232 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 233 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
233 | 234 | ||
235 | if HAVE_LIBGLPK | ||
234 | test_ats_solver_add_address_mlp_SOURCES = \ | 236 | test_ats_solver_add_address_mlp_SOURCES = \ |
235 | test_ats_solver_add_address.c | 237 | test_ats_solver_add_address.c |
236 | test_ats_solver_add_address_mlp_LDADD = \ | 238 | test_ats_solver_add_address_mlp_LDADD = \ |
@@ -239,7 +241,8 @@ test_ats_solver_add_address_mlp_LDADD = \ | |||
239 | $(top_builddir)/src/hello/libgnunethello.la \ | 241 | $(top_builddir)/src/hello/libgnunethello.la \ |
240 | $(top_builddir)/src/ats/libgnunetats.la \ | 242 | $(top_builddir)/src/ats/libgnunetats.la \ |
241 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 243 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
242 | 244 | endif | |
245 | |||
243 | test_ats_solver_add_address_ril_SOURCES = \ | 246 | test_ats_solver_add_address_ril_SOURCES = \ |
244 | test_ats_solver_add_address.c | 247 | test_ats_solver_add_address.c |
245 | test_ats_solver_add_address_ril_LDADD = \ | 248 | test_ats_solver_add_address_ril_LDADD = \ |
@@ -334,7 +337,7 @@ test_ats_solver_add_address_ril_LDADD = \ | |||
334 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 337 | # $(top_builddir)/src/testing/libgnunettesting.la \ |
335 | # $(top_builddir)/src/ats/libgnunetats.la | 338 | # $(top_builddir)/src/ats/libgnunetats.la |
336 | 339 | ||
337 | if HAVE_LIBGLPK | 340 | |
338 | #test_ats_mlp_SOURCES = \ | 341 | #test_ats_mlp_SOURCES = \ |
339 | # $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c | 342 | # $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c |
340 | #test_ats_mlp_LDADD = \ | 343 | #test_ats_mlp_LDADD = \ |
@@ -358,7 +361,6 @@ if HAVE_LIBGLPK | |||
358 | # $(top_builddir)/src/util/libgnunetutil.la \ | 361 | # $(top_builddir)/src/util/libgnunetutil.la \ |
359 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 362 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
360 | # $(top_builddir)/src/ats/libgnunetats.la | 363 | # $(top_builddir)/src/ats/libgnunetats.la |
361 | endif | ||
362 | 364 | ||
363 | #test_ats_normalization_update_quality_SOURCES = \ | 365 | #test_ats_normalization_update_quality_SOURCES = \ |
364 | # test_ats_normalization_update_quality.c test_ats_api_common.c | 366 | # test_ats_normalization_update_quality.c test_ats_api_common.c |
@@ -372,4 +374,7 @@ endif | |||
372 | EXTRA_DIST = \ | 374 | EXTRA_DIST = \ |
373 | ats.h \ | 375 | ats.h \ |
374 | test_ats_api.conf \ | 376 | test_ats_api.conf \ |
375 | test_ats_mlp.conf \ No newline at end of file | 377 | test_ats_mlp.conf \ |
378 | test_ats_solver_proportional.conf \ | ||
379 | test_ats_solver_mlp.conf \ | ||
380 | test_ats_solver_ril.conf | ||
diff --git a/src/ats/test_ats_solver_mlp.conf b/src/ats/test_ats_solver_mlp.conf index e69de29bb..a640e942d 100644 --- a/src/ats/test_ats_solver_mlp.conf +++ b/src/ats/test_ats_solver_mlp.conf | |||
@@ -0,0 +1,18 @@ | |||
1 | [ats] | ||
2 | #PREFIX = valgrind --leak-check=yes | ||
3 | MODE = MLP | ||
4 | # UNSPECIFIED | ||
5 | UNSPECIFIED_QUOTA_IN = 64 KiB | ||
6 | UNSPECIFIED_QUOTA_OUT = 64 KiB | ||
7 | # LOOPBACK | ||
8 | LOOPBACK_QUOTA_IN = unlimited | ||
9 | LOOPBACK_QUOTA_OUT = unlimited | ||
10 | # LAN | ||
11 | LAN_QUOTA_IN = unlimited | ||
12 | LAN_QUOTA_OUT = unlimited | ||
13 | # WAN | ||
14 | WAN_QUOTA_IN = 64 KiB | ||
15 | WAN_QUOTA_OUT = 64 KiB | ||
16 | # WLAN | ||
17 | WLAN_QUOTA_IN = 512 | ||
18 | WLAN_QUOTA_OUT = 512 \ No newline at end of file | ||
diff --git a/src/ats/test_ats_solver_proportional.conf b/src/ats/test_ats_solver_proportional.conf index e69de29bb..1b5914434 100644 --- a/src/ats/test_ats_solver_proportional.conf +++ b/src/ats/test_ats_solver_proportional.conf | |||
@@ -0,0 +1,18 @@ | |||
1 | [ats] | ||
2 | #PREFIX = valgrind --leak-check=yes | ||
3 | MODE = PROPORTIONAL | ||
4 | # UNSPECIFIED | ||
5 | UNSPECIFIED_QUOTA_IN = 64 KiB | ||
6 | UNSPECIFIED_QUOTA_OUT = 64 KiB | ||
7 | # LOOPBACK | ||
8 | LOOPBACK_QUOTA_IN = unlimited | ||
9 | LOOPBACK_QUOTA_OUT = unlimited | ||
10 | # LAN | ||
11 | LAN_QUOTA_IN = unlimited | ||
12 | LAN_QUOTA_OUT = unlimited | ||
13 | # WAN | ||
14 | WAN_QUOTA_IN = 64 KiB | ||
15 | WAN_QUOTA_OUT = 64 KiB | ||
16 | # WLAN | ||
17 | WLAN_QUOTA_IN = 512 | ||
18 | WLAN_QUOTA_OUT = 512 \ No newline at end of file | ||
diff --git a/src/ats/test_ats_solver_ril.conf b/src/ats/test_ats_solver_ril.conf index e69de29bb..b3f5d9b67 100644 --- a/src/ats/test_ats_solver_ril.conf +++ b/src/ats/test_ats_solver_ril.conf | |||
@@ -0,0 +1,18 @@ | |||
1 | [ats] | ||
2 | #PREFIX = valgrind --leak-check=yes | ||
3 | MODE = RIL | ||
4 | # UNSPECIFIED | ||
5 | UNSPECIFIED_QUOTA_IN = 64 KiB | ||
6 | UNSPECIFIED_QUOTA_OUT = 64 KiB | ||
7 | # LOOPBACK | ||
8 | LOOPBACK_QUOTA_IN = unlimited | ||
9 | LOOPBACK_QUOTA_OUT = unlimited | ||
10 | # LAN | ||
11 | LAN_QUOTA_IN = unlimited | ||
12 | LAN_QUOTA_OUT = unlimited | ||
13 | # WAN | ||
14 | WAN_QUOTA_IN = 64 KiB | ||
15 | WAN_QUOTA_OUT = 64 KiB | ||
16 | # WLAN | ||
17 | WLAN_QUOTA_IN = 512 | ||
18 | WLAN_QUOTA_OUT = 512 | ||