-fix config, shutdown issue

[oweals/gnunet.git] / src / ats / Makefile.am

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 60300f07c577f01b5226e7b85c42a6363b2d25d4..4491b08a206eb1b3b964fed62f3f4a2d1651bc47 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
@@ -17,12 +18,16 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+noinst_PROGRAMS = \
+ gnunet-ats-solver-eval
+
 if HAVE_LIBGLPK
   GN_LIBGLPK = -lglpk
   GN_MLP_LIB = libgnunet_plugin_ats_mlp.la
   GN_MLP_PERF = perf_ats_mlp
   GN_MLP_ADD_ADDRESS = test_ats_solver_add_address_mlp
   GN_MLP_ADD_REQUEST_ADDRESS = test_ats_solver_add_address_and_request_mlp
+  GN_MLP_ADD_REQUEST_ADDRESS_DELAYED = test_ats_solver_add_address_and_request_delayed_mlp
   GN_MLP_REQUEST_ADD_ADDRESS = test_ats_solver_request_and_add_address_mlp
   GN_MLP_REQUEST_DELETE_ADDRESS = test_ats_solver_request_and_delete_address_mlp
   GN_MLP_PREFERENCES_ADDRESS = test_ats_solver_preferences_mlp
@@ -37,10 +42,29 @@ plugin_LTLIBRARIES = \
   $(GN_MLP_LIB) \
   libgnunet_plugin_ats_ril.la
 
+gnunet_ats_solver_eval_SOURCES = \
+ gnunet-ats-solver-eval.c gnunet-ats-solver-eval.h \
+ gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+ gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
+ gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
+ gnunet-service-ats_feedback.c gnunet-service-ats_feedback.h \
+ gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
+ gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h \
+ gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
+ gnunet-service-ats_normalization.c
+gnunet_ats_solver_eval_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(LTLIBINTL)
+
 libgnunetats_la_SOURCES = \
+  ats_api_connectivity.c \
+  ats_api_scanner.c \
   ats_api_scheduling.c \
   ats_api_performance.c
 libgnunetats_la_LIBADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunetats_la_LDFLAGS = \
@@ -50,12 +74,10 @@ libgnunetats_la_LDFLAGS = \
 libgnunet_plugin_ats_proportional_la_SOURCES = \
   plugin_ats_proportional.c
 libgnunet_plugin_ats_proportional_la_LIBADD = \
-       libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
-libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
-  libgnunetats.la
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
@@ -64,13 +86,11 @@ if HAVE_LIBGLPK
 libgnunet_plugin_ats_mlp_la_SOURCES = \
   plugin_ats_mlp.c
 libgnunet_plugin_ats_mlp_la_LIBADD = \
-       libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_mlp_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK)
-libgnunet_plugin_ats_mlp_la_DEPENDENCIES = \
-  libgnunetats.la
 endif
 
 libgnunet_plugin_ats_ril_la_SOURCES = \
@@ -82,8 +102,6 @@ libgnunet_plugin_ats_ril_la_LIBADD = \
   $(LTLIBINTL)
 libgnunet_plugin_ats_ril_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_ats_ril_la_DEPENDENCIES = \
-  libgnunetats.la
 
 libexec_PROGRAMS = \
  gnunet-service-ats
@@ -91,8 +109,12 @@ libexec_PROGRAMS = \
 gnunet_service_ats_SOURCES = \
  gnunet-service-ats.c gnunet-service-ats.h\
  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+ gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
+ gnunet-service-ats_feedback.c gnunet-service-ats_feedback.h \
  gnunet-service-ats_normalization.c gnunet-service-ats_normalization.h \
  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
+ gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
+ gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
 gnunet_service_ats_LDADD = \
@@ -100,8 +122,6 @@ gnunet_service_ats_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetats.la \
   $(GN_LIBINTL)
-gnunet_service_ats_DEPENDENCIES = \
-  libgnunetats.la
 
 if HAVE_TESTING
 TESTING_TESTS = \
@@ -110,16 +130,18 @@ TESTING_TESTS = \
  test_ats_api_scheduling_add_address_duplicate \
  test_ats_api_scheduling_add_address_inbound \
  test_ats_api_scheduling_destroy_address \
- test_ats_api_scheduling_destroy_address_twice \
  test_ats_api_scheduling_add_session \
- test_ats_api_scheduling_destroy_session \
+ test_ats_api_delayed_service_scheduling_add_address \
  test_ats_api_performance_list_all_addresses \
+ test_ats_api_delayed_service_performance_list_all_addresses \
  test_ats_api_performance_list_peer_addresses \
  test_ats_api_performance_list_all_addresses_active \
  test_ats_api_performance_monitor \
+ test_ats_api_delayed_service_performance_monitor \
  test_ats_api_performance_monitor_initial_callback \
  test_ats_solver_add_address_proportional \
  test_ats_solver_add_address_and_request_proportional \
+ test_ats_solver_add_address_and_request_delayed_proportional\
  test_ats_solver_request_and_add_address_proportional \
  test_ats_solver_request_and_delete_address_proportional \
  test_ats_solver_alternative_after_delete_address_proportional \
@@ -127,12 +149,14 @@ TESTING_TESTS = \
  test_ats_solver_preferences_ril \
  $(GN_MLP_ADD_ADDRESS) \
  $(GN_MLP_ADD_REQUEST_ADDRESS) \
+ $(GN_MLP_ADD_REQUEST_ADDRESS_DELAYED) \
  $(GN_MLP_REQUEST_ADD_ADDRESS) \
  $(GN_MLP_REQUEST_DELETE_ADDRESS) \
  $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) \
  $(GN_MLP_PREFERENCES_ADDRESS) \
  test_ats_solver_add_address_ril \
  test_ats_solver_add_address_and_request_ril \
+  test_ats_solver_add_address_and_request_delayed_ril \
  test_ats_solver_request_and_add_address_ril \
  test_ats_solver_request_and_delete_address_ril \
  test_ats_solver_alternative_after_delete_address_ril \
@@ -145,6 +169,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -156,7 +181,7 @@ test_ats_api_scheduling_init_SOURCES = \
 test_ats_api_scheduling_init_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_SOURCES = \
@@ -165,7 +190,16 @@ test_ats_api_scheduling_add_address_SOURCES = \
 test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_ats_api_delayed_service_scheduling_add_address_SOURCES = \
+ test_ats_api_delayed_service_scheduling_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_api_delayed_service_scheduling_add_address_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_inbound_SOURCES = \
@@ -174,7 +208,7 @@ test_ats_api_scheduling_add_address_inbound_SOURCES = \
 test_ats_api_scheduling_add_address_inbound_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_duplicate_SOURCES = \
@@ -183,7 +217,7 @@ test_ats_api_scheduling_add_address_duplicate_SOURCES = \
 test_ats_api_scheduling_add_address_duplicate_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_SOURCES = \
@@ -192,16 +226,7 @@ test_ats_api_scheduling_destroy_address_SOURCES = \
 test_ats_api_scheduling_destroy_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_scheduling_destroy_address_twice_SOURCES = \
- test_ats_api_scheduling_destroy_address_twice.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_destroy_address_twice_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_session_SOURCES = \
@@ -209,15 +234,7 @@ test_ats_api_scheduling_add_session_SOURCES = \
 test_ats_api_scheduling_add_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_api_scheduling_destroy_session_SOURCES = \
- test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
-test_ats_api_scheduling_destroy_session_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # performance API tests
@@ -228,7 +245,16 @@ test_ats_api_performance_list_all_addresses_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_ats_api_delayed_service_performance_list_all_addresses_SOURCES = \
+ test_ats_api_delayed_service_performance_list_all_addresses.c
+test_ats_api_delayed_service_performance_list_all_addresses_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_list_peer_addresses_SOURCES = \
@@ -237,7 +263,7 @@ test_ats_api_performance_list_peer_addresses_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_list_all_addresses_active_SOURCES = \
@@ -246,7 +272,7 @@ test_ats_api_performance_list_all_addresses_active_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_monitor_SOURCES = \
@@ -255,16 +281,27 @@ test_ats_api_performance_monitor_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_ats_api_delayed_service_performance_monitor_SOURCES = \
+ test_ats_api_delayed_service_performance_monitor.c
+test_ats_api_delayed_service_performance_monitor_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
+
+
 test_ats_api_performance_monitor_initial_callback_SOURCES = \
  test_ats_api_performance_monitor_initial_callback.c
 test_ats_api_performance_monitor_initial_callback_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # solver tests
@@ -275,7 +312,7 @@ test_ats_solver_add_address_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
@@ -286,7 +323,7 @@ test_ats_solver_add_address_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -297,7 +334,7 @@ test_ats_solver_add_address_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_add_address_and_request_proportional_SOURCES = \
@@ -307,7 +344,27 @@ test_ats_solver_add_address_and_request_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_ats_solver_add_address_and_request_delayed_proportional_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_delayed_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_ats_solver_add_address_and_request_delayed_ril_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_delayed_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
@@ -318,10 +375,20 @@ test_ats_solver_add_address_and_request_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
+test_ats_solver_add_address_and_request_delayed_mlp_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_delayed_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
 test_ats_solver_add_address_and_request_ril_SOURCES = \
  test_ats_solver_add_address_and_request.c \
  test_ats_api_common.c test_ats_api_common.h
@@ -329,7 +396,7 @@ test_ats_solver_add_address_and_request_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
@@ -340,7 +407,7 @@ test_ats_solver_request_and_add_address_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
@@ -351,7 +418,7 @@ test_ats_solver_request_and_add_address_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -362,8 +429,8 @@ test_ats_solver_request_and_add_address_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
 test_ats_solver_request_and_delete_address_proportional_SOURCES = \
@@ -373,8 +440,8 @@ test_ats_solver_request_and_delete_address_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
 test_ats_solver_request_and_delete_address_mlp_SOURCES = \
@@ -384,8 +451,8 @@ test_ats_solver_request_and_delete_address_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
 test_ats_solver_request_and_delete_address_ril_SOURCES = \
@@ -395,8 +462,8 @@ test_ats_solver_request_and_delete_address_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
 test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \
@@ -406,8 +473,8 @@ test_ats_solver_alternative_after_delete_address_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_preferences_proportional_SOURCES = \
  test_ats_solver_preferences.c \
@@ -416,8 +483,8 @@ test_ats_solver_preferences_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
 test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \
@@ -427,7 +494,7 @@ test_ats_solver_alternative_after_delete_address_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_preferences_mlp_SOURCES = \
@@ -437,7 +504,7 @@ test_ats_solver_preferences_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -448,7 +515,7 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 #perf_ats_mlp_SOURCES = \
@@ -457,31 +524,61 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
 #  $(GN_LIBGLPK) \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
+#  libgnunetats.la
 
 perf_ats_solver_mlp_SOURCES = \
-  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+  perf_ats_solver.c \
+  test_ats_api_common.c \
+  gnunet-service-ats_normalization.c \
+  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
+  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
+  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
+  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
+  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
+  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
+
 perf_ats_solver_mlp_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la
+  libgnunetats.la
 
 perf_ats_solver_proportional_SOURCES = \
-  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+  perf_ats_solver.c \
+  test_ats_api_common.c \
+  gnunet-service-ats_normalization.c \
+  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
+  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
+  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
+  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
+  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
+  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
+
 perf_ats_solver_proportional_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la
+  libgnunetats.la
 
 perf_ats_solver_ril_SOURCES = \
-  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+  perf_ats_solver.c \
+  test_ats_api_common.c \
+  gnunet-service-ats_normalization.c \
+  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+  gnunet-service-ats_connectivity.c gnunet-service-ats_connectivity.h \
+  gnunet-service-ats_preferences.c gnunet-service-ats_preferences.h \
+  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
+  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
+  gnunet-service-ats_plugins.c gnunet-service-ats_plugins.h \
+  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
+
 perf_ats_solver_ril_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la
+  libgnunetats.la
 
 test_ats_solver_preferences_ril_SOURCES = \
  test_ats_solver_preferences.c \
@@ -490,31 +587,24 @@ test_ats_solver_preferences_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-test_ats_solver_convergence_ril_SOURCES = \
- test_ats_solver_convergence.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_solver_convergence_ril_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 EXTRA_DIST = \
   ats.h \
-  plugin_ats_proportional.h \
-  plugin_ats_mlp.h \
-  plugin_ats_ril.h \
+  test_delay \
   test_ats_api.conf \
+  test_ats_api_delayed.conf \
   test_ats_mlp.conf \
   test_ats_solver_default.conf \
   test_ats_solver_proportional.conf \
+  test_ats_solver_proportional.conf \
   test_ats_solver_mlp.conf \
+  test_ats_solver_delayed_mlp.conf \
   test_ats_solver_ril.conf \
+  test_ats_solver_delayed_ril.conf \
   perf_ats_solver_mlp.conf \
+  test_ats_solver_delayed_mlp.conf \
   perf_ats_solver_proportional.conf \
   perf_ats_solver_ril.conf \
   perf_ats_solver.conf