-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
pkgcfgdir= $(pkgdatadir)/config.d/
ats.conf
if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
endif
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
+lib_LTLIBRARIES = libgnunetats.la
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_ats_proportional.la \
+ $(GN_MLP_LIB) \
+ libgnunet_plugin_ats_ril.la
+
if HAVE_LIBGLPK
- GN_LIBGLPK = -lglpk
- GN_MLP_SRC = gnunet-service-ats-solver_mlp.c gnunet-service-ats-solver_mlp.h
- GN_MLP_TEST = test_ats_mlp
- GN_MLP_TEST_UPDATE = test_ats_mlp_update
- GN_MLP_TEST_AVG = test_ats_mlp_averaging
- GN_MLP_PERF = perf_ats_mlp
+plugin_LTLIBRARIES += \
+ libgnunet_plugin_ats_mlp.la
endif
-lib_LTLIBRARIES = libgnunetats.la
-
libgnunetats_la_SOURCES = \
+ ats_api_connectivity.c \
+ ats_api_scanner.c \
ats_api_scheduling.c \
- ats_api_performance.c
-
+ ats_api_performance.c
libgnunetats_la_LIBADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
-
libgnunetats_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 4:0:0
+libgnunet_plugin_ats_proportional_la_SOURCES = \
+ plugin_ats_proportional.c
+libgnunet_plugin_ats_proportional_la_LIBADD = \
+ libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_ats_proportional_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+if HAVE_LIBGLPK
+libgnunet_plugin_ats_mlp_la_SOURCES = \
+ plugin_ats_mlp.c
+libgnunet_plugin_ats_mlp_la_LIBADD = \
+ libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_ats_mlp_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS) \
+ -lglpk
+endif
+
+libgnunet_plugin_ats_ril_la_SOURCES = \
+ plugin_ats_ril.c
+libgnunet_plugin_ats_ril_la_LIBADD = \
+ libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_ats_ril_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
libexec_PROGRAMS = \
gnunet-service-ats
gnunet_service_ats_SOURCES = \
- gnunet-service-ats.c gnunet-service-ats.h\
+ 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-solver_proportional.c gnunet-service-ats-solver_proportional.h \
- $(GN_MLP_SRC) \
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 = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunetats.la \
- $(GN_LIBGLPK) \
$(GN_LIBINTL)
-gnunet_service_ats_DEPENDENCIES = \
- libgnunetats.la
+
+if HAVE_TESTING
+TESTING_TESTS = \
+ test_ats_api_proportional \
+ test_ats_reservation_api_proportional
+if HAVE_WACHS
+TESTING_TESTS += \
+ test_ats_api_ril
+if HAVE_LIBGLPK
+TESTING_TESTS += \
+ test_ats_api_mlp
+endif
+endif
+endif
check_PROGRAMS = \
- test_ats_api_scheduling_init \
- test_ats_api_scheduling_add_address \
- test_ats_api_scheduling_add_session \
- test_ats_api_scheduling_min_bw \
- test_ats_api_scheduling_check_min_bw_alt \
- test_ats_api_scheduling_update_address \
- test_ats_api_scheduling_destroy_address \
- test_ats_api_scheduling_destroy_session \
- test_ats_api_scheduling_destroy_inbound_connection \
- test_ats_api_scheduling_block_and_reset \
- test_ats_normalization_update_quality \
- test_ats_change_preference \
- test_ats_simplistic \
- test_ats_simplistic_switch_networks \
- test_ats_simplistic_change_preference \
- test_ats_api_performance_list_addresses \
- test_ats_api_performance_address_info \
- $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
-# $(GN_MLP_TEST_AVG)
-# test_ats_api_scheduling_get_type
-# test_ats_api_bandwidth_consumption
+ $(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
-test_ats_api_scheduling_init_SOURCES = \
- test_ats_api_scheduling_init.c \
- test_ats_api_common.c test_ats_api_common.h
-test_ats_api_scheduling_init_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_api_scheduling_add_address_SOURCES = \
- test_ats_api_scheduling_add_address.c \
- test_ats_api_common.c test_ats_api_common.h
-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
-
-test_ats_api_scheduling_add_session_SOURCES = \
- test_ats_api_scheduling_add_session.c test_ats_api_common.c
-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
-
-test_ats_api_scheduling_min_bw_SOURCES = \
- test_ats_api_scheduling_min_bw.c test_ats_api_common.c
-test_ats_api_scheduling_min_bw_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_api_scheduling_check_min_bw_alt_SOURCES = \
- test_ats_api_scheduling_check_min_bw_alt.c test_ats_api_common.c
-test_ats_api_scheduling_check_min_bw_alt_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-
-test_ats_api_scheduling_update_address_SOURCES = \
- test_ats_api_scheduling_update_address.c test_ats_api_common.c
-test_ats_api_scheduling_update_address_LDADD = \
+test_ats_api_proportional_SOURCES = \
+ test_ats_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_api_proportional_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_api_scheduling_destroy_address_SOURCES = \
- test_ats_api_scheduling_destroy_address.c test_ats_api_common.c
-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
-
-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
-
-test_ats_api_scheduling_destroy_inbound_connection_SOURCES = \
- test_ats_api_scheduling_destroy_inbound_connection.c test_ats_api_common.c
-test_ats_api_scheduling_destroy_inbound_connection_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_api_scheduling_block_and_reset_SOURCES = \
- test_ats_api_scheduling_block_and_reset.c test_ats_api_common.c
-test_ats_api_scheduling_block_and_reset_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_api_performance_list_addresses_SOURCES = \
- test_ats_api_performance_list_addresses.c
-test_ats_api_performance_list_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
-
-test_ats_api_performance_address_info_SOURCES = \
- test_ats_api_performance_address_info.c
-test_ats_api_performance_address_info_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
-test_ats_simplistic_SOURCES = \
- test_ats_simplistic.c test_ats_api_common.c
-test_ats_simplistic_LDADD = \
+test_ats_reservation_api_proportional_SOURCES = \
+ test_ats_reservation_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_reservation_api_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
-
-test_ats_simplistic_switch_networks_SOURCES = \
- test_ats_simplistic_switch_networks.c test_ats_api_common.c
-test_ats_simplistic_switch_networks_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_simplistic_change_preference_SOURCES = \
- test_ats_simplistic_change_preference.c test_ats_api_common.c
-test_ats_simplistic_change_preference_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
+ libgnunetats.la
-test_ats_change_preference_SOURCES = \
- test_ats_change_preference.c test_ats_api_common.c
-test_ats_change_preference_LDADD = \
+test_ats_api_ril_SOURCES = \
+ test_ats_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_api_ril_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-if HAVE_LIBGLPK
-test_ats_mlp_SOURCES = \
- $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c
-test_ats_mlp_LDADD = \
- $(GN_LIBGLPK) \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-test_ats_mlp_update_SOURCES = \
- $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c gnunet-service-ats_normalization.c
-test_ats_mlp_update_LDADD = \
- $(GN_LIBGLPK) \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-
-perf_ats_mlp_SOURCES = \
- $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c
-perf_ats_mlp_LDADD = \
- $(GN_LIBGLPK) \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/ats/libgnunetats.la
-endif
+ libgnunetats.la
-test_ats_normalization_update_quality_SOURCES = \
- test_ats_normalization_update_quality.c test_ats_api_common.c
-test_ats_normalization_update_quality_LDADD = \
- $(GN_LIBGLPK) \
+test_ats_api_mlp_SOURCES = \
+ test_ats_api.c \
+ test_ats_lib.c test_ats_lib.h
+test_ats_api_mlp_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/ats/libgnunetats.la
-
-#test_ats_mlp_averaging_SOURCES = \
-# $(GN_MLP_SRC) test_ats_mlp_averaging.c test_ats_api_common.c
-#test_ats_mlp_averaging_LDADD = \
-# $(GN_LIBGLPK) \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-#test_ats_api_bandwidth_consumption_SOURCES = \
-# test_ats_api_bandwidth_consumption.c
-#test_ats_api_bandwidth_consumption_LDADD = \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/testing/libgnunettesting.la \
-# $(top_builddir)/src/ats/libgnunetats.la
-
+ libgnunetats.la
EXTRA_DIST = \
ats.h \
- test_ats_api.conf \
- test_ats_mlp.conf
-
+ test_delay \
+ test_ats_api_mlp.conf \
+ test_ats_api_ril.conf \
+ test_ats_api_proportional.conf