diff options
Diffstat (limited to 'src/ats')
41 files changed, 9693 insertions, 2406 deletions
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 2e85848..f9a1ec4 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -2,6 +2,8 @@ INCLUDES = -I$(top_srcdir)/src/include pkgcfgdir= $(pkgdatadir)/config.d/ +libexecdir= $(pkglibdir)/libexec/ + pkgcfg_DATA = \ ats.conf @@ -28,19 +30,21 @@ libgnunetats_la_SOURCES = \ ats_api_performance.c libgnunetats_la_LIBADD = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) libgnunetats_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ - -version-info 2:0:2 + -version-info 4:0:0 -bin_PROGRAMS = \ +libexec_PROGRAMS = \ gnunet-service-ats 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_addresses_simplistic.c gnunet-service-ats_addresses_simplistic.h \ $(GN_MLP_SRC) \ gnunet-service-ats_performance.c gnunet-service-ats_performance.h \ gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \ @@ -48,16 +52,31 @@ gnunet_service_ats_SOURCES = \ 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 check_PROGRAMS = \ - test_ats_api_scheduling \ - test_ats_api_reset_backoff \ - $(GN_MLP_TEST) \ - $(GN_MLP_TEST_AVG) \ - $(GN_MLP_PERF) + 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_simplistic \ + test_ats_simplistic_switch_networks \ + test_ats_simplistic_change_preference \ + test_ats_simplistic_pref_aging \ + test_ats_api_performance +# $(GN_MLP_TEST) \ +# $(GN_MLP_TEST_AVG) \ +# $(GN_MLP_PERF) # test_ats_api_scheduling_get_type # test_ats_api_bandwidth_consumption @@ -65,60 +84,147 @@ if ENABLE_TEST_RUN TESTS = $(check_PROGRAMS) endif -if HAVE_LIBGLPK -test_ats_mlp_SOURCES = \ - $(GN_MLP_SRC) \ - test_ats_mlp.c -test_ats_mlp_LDADD = \ - $(GN_LIBGLPK) \ +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/statistics/libgnunetstatistics.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_mlp_averaging_LDADD = \ - $(GN_LIBGLPK) \ +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/statistics/libgnunetstatistics.la + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la -perf_ats_mlp_SOURCES = \ - $(GN_MLP_SRC) \ - perf_ats_mlp.c -perf_ats_mlp_LDADD = \ - $(GN_LIBGLPK) \ +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/statistics/libgnunetstatistics.la -endif + $(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 = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la -test_ats_api_scheduling_SOURCES = \ - test_ats_api_scheduling.c -test_ats_api_scheduling_LDADD = \ +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_reset_backoff_SOURCES = \ - test_ats_api_reset_backoff.c -test_ats_api_reset_backoff_LDADD = \ +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_SOURCES = \ + test_ats_api_performance.c +test_ats_api_performance_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_SOURCES = \ + test_ats_simplistic.c test_ats_api_common.c +test_ats_simplistic_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 + +test_ats_simplistic_pref_aging_SOURCES = \ + test_ats_simplistic_pref_aging.c test_ats_api_common.c +test_ats_simplistic_pref_aging_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la -#test_ats_api_scheduling_get_type_SOURCES = \ -# test_ats_api_scheduling_get_type.c -#test_ats_api_scheduling_get_type_LDADD = \ +if HAVE_LIBGLPK +#test_ats_mlp_SOURCES = \ +# $(GN_MLP_SRC) \ +# test_ats_mlp.c +#test_ats_mlp_LDADD = \ +# $(GN_LIBGLPK) \ # $(top_builddir)/src/util/libgnunetutil.la \ -# $(top_builddir)/src/ats/libgnunetats.la +# $(top_builddir)/src/statistics/libgnunetstatistics.la + +#test_ats_mlp_averaging_SOURCES = \ +# $(GN_MLP_SRC) \ +# test_ats_mlp_averaging.c +#test_ats_mlp_averaging_LDADD = \ +# $(GN_LIBGLPK) \ +# $(top_builddir)/src/util/libgnunetutil.la \ +# $(top_builddir)/src/statistics/libgnunetstatistics.la + +#perf_ats_mlp_SOURCES = \ +# $(GN_MLP_SRC) \ +# perf_ats_mlp.c +#perf_ats_mlp_LDADD = \ +# $(GN_LIBGLPK) \ +# $(top_builddir)/src/util/libgnunetutil.la \ +# $(top_builddir)/src/statistics/libgnunetstatistics.la +endif #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/ats/libgnunetats.la - -#test_ats_api_update_address_SOURCES = \ -# test_ats_api_update_address.c -#test_ats_api_update_address_LDADD = \ -# $(top_builddir)/src/util/libgnunetutil.la \ +# $(top_builddir)/src/testing/libgnunettesting.la \ # $(top_builddir)/src/ats/libgnunetats.la diff --git a/src/ats/Makefile.in b/src/ats/Makefile.in index 7f74064..e9a1c3a 100644 --- a/src/ats/Makefile.in +++ b/src/ats/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +54,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = gnunet-service-ats$(EXEEXT) -check_PROGRAMS = test_ats_api_scheduling$(EXEEXT) \ - test_ats_api_reset_backoff$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) $(am__EXEEXT_3) +libexec_PROGRAMS = gnunet-service-ats$(EXEEXT) +check_PROGRAMS = test_ats_api_scheduling_init$(EXEEXT) \ + test_ats_api_scheduling_add_address$(EXEEXT) \ + test_ats_api_scheduling_add_session$(EXEEXT) \ + test_ats_api_scheduling_min_bw$(EXEEXT) \ + test_ats_api_scheduling_check_min_bw_alt$(EXEEXT) \ + test_ats_api_scheduling_update_address$(EXEEXT) \ + test_ats_api_scheduling_destroy_address$(EXEEXT) \ + test_ats_api_scheduling_destroy_session$(EXEEXT) \ + test_ats_api_scheduling_destroy_inbound_connection$(EXEEXT) \ + test_ats_api_scheduling_block_and_reset$(EXEEXT) \ + test_ats_simplistic$(EXEEXT) \ + test_ats_simplistic_switch_networks$(EXEEXT) \ + test_ats_simplistic_change_preference$(EXEEXT) \ + test_ats_simplistic_pref_aging$(EXEEXT) \ + test_ats_api_performance$(EXEEXT) subdir = src/ats DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/ats.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \ $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \ - $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -84,28 +114,35 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(pkgcfgdir)" LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = libgnunetats_la_DEPENDENCIES = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la \ + $(am__DEPENDENCIES_1) am_libgnunetats_la_OBJECTS = ats_api_scheduling.lo \ ats_api_performance.lo libgnunetats_la_OBJECTS = $(am_libgnunetats_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libgnunetats_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgnunetats_la_LDFLAGS) $(LDFLAGS) \ -o $@ -@HAVE_LIBGLPK_TRUE@am__EXEEXT_1 = test_ats_mlp$(EXEEXT) -@HAVE_LIBGLPK_TRUE@am__EXEEXT_2 = test_ats_mlp_averaging$(EXEEXT) -@HAVE_LIBGLPK_TRUE@am__EXEEXT_3 = perf_ats_mlp$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) +PROGRAMS = $(libexec_PROGRAMS) am__gnunet_service_ats_SOURCES_DIST = gnunet-service-ats.c \ gnunet-service-ats.h gnunet-service-ats_addresses.c \ gnunet-service-ats_addresses.h \ + gnunet-service-ats_addresses_simplistic.c \ + gnunet-service-ats_addresses_simplistic.h \ gnunet-service-ats_addresses_mlp.c \ gnunet-service-ats_addresses_mlp.h \ gnunet-service-ats_performance.c \ @@ -117,57 +154,145 @@ am__gnunet_service_ats_SOURCES_DIST = gnunet-service-ats.c \ @HAVE_LIBGLPK_TRUE@am__objects_1 = \ @HAVE_LIBGLPK_TRUE@ gnunet-service-ats_addresses_mlp.$(OBJEXT) am_gnunet_service_ats_OBJECTS = gnunet-service-ats.$(OBJEXT) \ - gnunet-service-ats_addresses.$(OBJEXT) $(am__objects_1) \ - gnunet-service-ats_performance.$(OBJEXT) \ + gnunet-service-ats_addresses.$(OBJEXT) \ + gnunet-service-ats_addresses_simplistic.$(OBJEXT) \ + $(am__objects_1) gnunet-service-ats_performance.$(OBJEXT) \ gnunet-service-ats_scheduling.$(OBJEXT) \ gnunet-service-ats_reservations.$(OBJEXT) gnunet_service_ats_OBJECTS = $(am_gnunet_service_ats_OBJECTS) -am__DEPENDENCIES_1 = -gnunet_service_ats_DEPENDENCIES = \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ +am_test_ats_api_performance_OBJECTS = \ + test_ats_api_performance.$(OBJEXT) +test_ats_api_performance_OBJECTS = \ + $(am_test_ats_api_performance_OBJECTS) +test_ats_api_performance_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am__perf_ats_mlp_SOURCES_DIST = gnunet-service-ats_addresses_mlp.c \ - gnunet-service-ats_addresses_mlp.h perf_ats_mlp.c -@HAVE_LIBGLPK_TRUE@am_perf_ats_mlp_OBJECTS = $(am__objects_1) \ -@HAVE_LIBGLPK_TRUE@ perf_ats_mlp.$(OBJEXT) -perf_ats_mlp_OBJECTS = $(am_perf_ats_mlp_OBJECTS) -@HAVE_LIBGLPK_TRUE@perf_ats_mlp_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@HAVE_LIBGLPK_TRUE@ $(top_builddir)/src/util/libgnunetutil.la \ -@HAVE_LIBGLPK_TRUE@ $(top_builddir)/src/statistics/libgnunetstatistics.la -am_test_ats_api_reset_backoff_OBJECTS = \ - test_ats_api_reset_backoff.$(OBJEXT) -test_ats_api_reset_backoff_OBJECTS = \ - $(am_test_ats_api_reset_backoff_OBJECTS) -test_ats_api_reset_backoff_DEPENDENCIES = \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_add_address_OBJECTS = \ + test_ats_api_scheduling_add_address.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_add_address_OBJECTS = \ + $(am_test_ats_api_scheduling_add_address_OBJECTS) +test_ats_api_scheduling_add_address_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la -am_test_ats_api_scheduling_OBJECTS = \ - test_ats_api_scheduling.$(OBJEXT) -test_ats_api_scheduling_OBJECTS = \ - $(am_test_ats_api_scheduling_OBJECTS) -test_ats_api_scheduling_DEPENDENCIES = \ +am_test_ats_api_scheduling_add_session_OBJECTS = \ + test_ats_api_scheduling_add_session.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_add_session_OBJECTS = \ + $(am_test_ats_api_scheduling_add_session_OBJECTS) +test_ats_api_scheduling_add_session_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_block_and_reset_OBJECTS = \ + test_ats_api_scheduling_block_and_reset.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_block_and_reset_OBJECTS = \ + $(am_test_ats_api_scheduling_block_and_reset_OBJECTS) +test_ats_api_scheduling_block_and_reset_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_check_min_bw_alt_OBJECTS = \ + test_ats_api_scheduling_check_min_bw_alt.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_check_min_bw_alt_OBJECTS = \ + $(am_test_ats_api_scheduling_check_min_bw_alt_OBJECTS) +test_ats_api_scheduling_check_min_bw_alt_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_destroy_address_OBJECTS = \ + test_ats_api_scheduling_destroy_address.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_destroy_address_OBJECTS = \ + $(am_test_ats_api_scheduling_destroy_address_OBJECTS) +test_ats_api_scheduling_destroy_address_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_destroy_inbound_connection_OBJECTS = \ + test_ats_api_scheduling_destroy_inbound_connection.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_destroy_inbound_connection_OBJECTS = $(am_test_ats_api_scheduling_destroy_inbound_connection_OBJECTS) +test_ats_api_scheduling_destroy_inbound_connection_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_destroy_session_OBJECTS = \ + test_ats_api_scheduling_destroy_session.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_destroy_session_OBJECTS = \ + $(am_test_ats_api_scheduling_destroy_session_OBJECTS) +test_ats_api_scheduling_destroy_session_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_init_OBJECTS = \ + test_ats_api_scheduling_init.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_init_OBJECTS = \ + $(am_test_ats_api_scheduling_init_OBJECTS) +test_ats_api_scheduling_init_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_min_bw_OBJECTS = \ + test_ats_api_scheduling_min_bw.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_min_bw_OBJECTS = \ + $(am_test_ats_api_scheduling_min_bw_OBJECTS) +test_ats_api_scheduling_min_bw_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_api_scheduling_update_address_OBJECTS = \ + test_ats_api_scheduling_update_address.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_api_scheduling_update_address_OBJECTS = \ + $(am_test_ats_api_scheduling_update_address_OBJECTS) +test_ats_api_scheduling_update_address_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_simplistic_OBJECTS = test_ats_simplistic.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_simplistic_OBJECTS = $(am_test_ats_simplistic_OBJECTS) +test_ats_simplistic_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_simplistic_change_preference_OBJECTS = \ + test_ats_simplistic_change_preference.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_simplistic_change_preference_OBJECTS = \ + $(am_test_ats_simplistic_change_preference_OBJECTS) +test_ats_simplistic_change_preference_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_simplistic_pref_aging_OBJECTS = \ + test_ats_simplistic_pref_aging.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_simplistic_pref_aging_OBJECTS = \ + $(am_test_ats_simplistic_pref_aging_OBJECTS) +test_ats_simplistic_pref_aging_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/ats/libgnunetats.la +am_test_ats_simplistic_switch_networks_OBJECTS = \ + test_ats_simplistic_switch_networks.$(OBJEXT) \ + test_ats_api_common.$(OBJEXT) +test_ats_simplistic_switch_networks_OBJECTS = \ + $(am_test_ats_simplistic_switch_networks_OBJECTS) +test_ats_simplistic_switch_networks_DEPENDENCIES = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/ats/libgnunetats.la -am__test_ats_mlp_SOURCES_DIST = gnunet-service-ats_addresses_mlp.c \ - gnunet-service-ats_addresses_mlp.h test_ats_mlp.c -@HAVE_LIBGLPK_TRUE@am_test_ats_mlp_OBJECTS = $(am__objects_1) \ -@HAVE_LIBGLPK_TRUE@ test_ats_mlp.$(OBJEXT) -test_ats_mlp_OBJECTS = $(am_test_ats_mlp_OBJECTS) -@HAVE_LIBGLPK_TRUE@test_ats_mlp_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@HAVE_LIBGLPK_TRUE@ $(top_builddir)/src/util/libgnunetutil.la \ -@HAVE_LIBGLPK_TRUE@ $(top_builddir)/src/statistics/libgnunetstatistics.la -am__test_ats_mlp_averaging_SOURCES_DIST = \ - gnunet-service-ats_addresses_mlp.c \ - gnunet-service-ats_addresses_mlp.h test_ats_mlp_averaging.c -@HAVE_LIBGLPK_TRUE@am_test_ats_mlp_averaging_OBJECTS = \ -@HAVE_LIBGLPK_TRUE@ $(am__objects_1) \ -@HAVE_LIBGLPK_TRUE@ test_ats_mlp_averaging.$(OBJEXT) -test_ats_mlp_averaging_OBJECTS = $(am_test_ats_mlp_averaging_OBJECTS) -@HAVE_LIBGLPK_TRUE@test_ats_mlp_averaging_DEPENDENCIES = \ -@HAVE_LIBGLPK_TRUE@ $(am__DEPENDENCIES_1) \ -@HAVE_LIBGLPK_TRUE@ $(top_builddir)/src/util/libgnunetutil.la \ -@HAVE_LIBGLPK_TRUE@ $(top_builddir)/src/statistics/libgnunetstatistics.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -178,33 +303,60 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgnunetats_la_SOURCES) $(gnunet_service_ats_SOURCES) \ - $(perf_ats_mlp_SOURCES) $(test_ats_api_reset_backoff_SOURCES) \ - $(test_ats_api_scheduling_SOURCES) $(test_ats_mlp_SOURCES) \ - $(test_ats_mlp_averaging_SOURCES) + $(test_ats_api_performance_SOURCES) \ + $(test_ats_api_scheduling_add_address_SOURCES) \ + $(test_ats_api_scheduling_add_session_SOURCES) \ + $(test_ats_api_scheduling_block_and_reset_SOURCES) \ + $(test_ats_api_scheduling_check_min_bw_alt_SOURCES) \ + $(test_ats_api_scheduling_destroy_address_SOURCES) \ + $(test_ats_api_scheduling_destroy_inbound_connection_SOURCES) \ + $(test_ats_api_scheduling_destroy_session_SOURCES) \ + $(test_ats_api_scheduling_init_SOURCES) \ + $(test_ats_api_scheduling_min_bw_SOURCES) \ + $(test_ats_api_scheduling_update_address_SOURCES) \ + $(test_ats_simplistic_SOURCES) \ + $(test_ats_simplistic_change_preference_SOURCES) \ + $(test_ats_simplistic_pref_aging_SOURCES) \ + $(test_ats_simplistic_switch_networks_SOURCES) DIST_SOURCES = $(libgnunetats_la_SOURCES) \ $(am__gnunet_service_ats_SOURCES_DIST) \ - $(am__perf_ats_mlp_SOURCES_DIST) \ - $(test_ats_api_reset_backoff_SOURCES) \ - $(test_ats_api_scheduling_SOURCES) \ - $(am__test_ats_mlp_SOURCES_DIST) \ - $(am__test_ats_mlp_averaging_SOURCES_DIST) + $(test_ats_api_performance_SOURCES) \ + $(test_ats_api_scheduling_add_address_SOURCES) \ + $(test_ats_api_scheduling_add_session_SOURCES) \ + $(test_ats_api_scheduling_block_and_reset_SOURCES) \ + $(test_ats_api_scheduling_check_min_bw_alt_SOURCES) \ + $(test_ats_api_scheduling_destroy_address_SOURCES) \ + $(test_ats_api_scheduling_destroy_inbound_connection_SOURCES) \ + $(test_ats_api_scheduling_destroy_session_SOURCES) \ + $(test_ats_api_scheduling_init_SOURCES) \ + $(test_ats_api_scheduling_min_bw_SOURCES) \ + $(test_ats_api_scheduling_update_address_SOURCES) \ + $(test_ats_simplistic_SOURCES) \ + $(test_ats_simplistic_change_preference_SOURCES) \ + $(test_ats_simplistic_pref_aging_SOURCES) \ + $(test_ats_simplistic_switch_networks_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgcfg_DATA) ETAGS = etags CTAGS = ctags @@ -246,6 +398,10 @@ EXEEXT = @EXEEXT@ EXT_LIBS = @EXT_LIBS@ EXT_LIB_PATH = @EXT_LIB_PATH@ FGREP = @FGREP@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ |