projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix eligibility traces
[oweals/gnunet.git] / src / ats / Makefile.am
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 1fbd434ee2b9e2da4d161f87b3f10b8a7a7dab29..714f3640d860215bc933e78a6acff80c1d406f9c 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,5 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
+plugindir = $(libdir)/gnunet
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -17,24 +19,26 @@ endif
 
 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_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_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_ALTERNATIVE_DELETE_ADDRESS = test_ats_solver_alternative_after_delete_address_mlp
-
+  GN_MLP_SOLVER_PERF = perf_ats_solver_mlp
 endif
 
 lib_LTLIBRARIES = libgnunetats.la
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_ats_proportional.la \
+  $(GN_MLP_LIB) \
+  libgnunet_plugin_ats_ril.la
+
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
-  ats_api_performance.c 
+  ats_api_performance.c  
 
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -44,6 +48,42 @@ libgnunetats_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
   -version-info 4:0:0
 
+libgnunet_plugin_ats_proportional_la_SOURCES = \
+  libgnunet_plugin_ats_proportional.c
+libgnunet_plugin_ats_proportional_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats_proportional_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
+  libgnunetats.la
+
+if HAVE_LIBGLPK
+libgnunet_plugin_ats_mlp_la_SOURCES = \
+  libgnunet_plugin_ats_mlp.c
+libgnunet_plugin_ats_mlp_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.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 = \
+  libgnunet_plugin_ats_ril.c
+libgnunet_plugin_ats_ril_la_LIBADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats_ril_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_ats_ril_la_DEPENDENCIES = \
+  libgnunetats.la
 
 libexec_PROGRAMS = \
  gnunet-service-ats
@@ -52,9 +92,6 @@ 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_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-solver_ril.c gnunet-service-ats-solver_ril.h \
  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
@@ -62,7 +99,6 @@ 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
@@ -87,35 +123,23 @@ TESTING_TESTS = \
  test_ats_solver_request_and_add_address_proportional \
  test_ats_solver_request_and_delete_address_proportional \
  test_ats_solver_alternative_after_delete_address_proportional \
- $(GN_MLP_ADD_REQUEST_ADDRESS) \
+ $(GN_MLP_ADD_ADDRESS) \
  $(GN_MLP_ADD_REQUEST_ADDRESS) \
  $(GN_MLP_REQUEST_ADD_ADDRESS) \
  $(GN_MLP_REQUEST_DELETE_ADDRESS) \
- $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS)
-# test_ats_solver_add_address_ril
-# test_ats_solver_add_address_and_request_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
-  
-# 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_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_address_info
-# test_ats_api_performance_feedback
+ $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) \
+ test_ats_solver_add_address_ril \
+ test_ats_solver_add_address_and_request_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 \
+ perf_ats_solver_proportional \
+ $(GN_MLP_SOLVER_PERF) \
+ perf_ats_solver_ril 
 endif
 
 check_PROGRAMS = \
  $(TESTING_TESTS)
-# $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
-# $(GN_MLP_TEST_AVG)
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -404,108 +428,6 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.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_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_feedback_SOURCES = \
-# test_ats_api_performance_feedback.c
-#test_ats_api_performance_feedback_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
-
-
-#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_change_preference_SOURCES = \
-# test_ats_change_preference.c test_ats_api_common.c
-#test_ats_change_preference_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
-
-
-#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 = \
@@ -514,15 +436,31 @@ test_ats_solver_alternative_after_delete_address_ril_LDADD = \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
 #  $(top_builddir)/src/ats/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) \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
-#endif
+perf_ats_solver_mlp_SOURCES = \
+  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+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 
+
+perf_ats_solver_proportional_SOURCES = \
+  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+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 
+
+perf_ats_solver_ril_SOURCES = \
+  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+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 
+
+
 EXTRA_DIST = \
   ats.h \
   test_ats_api.conf \
@@ -530,4 +468,8 @@ EXTRA_DIST = \
   test_ats_solver_default.conf \
   test_ats_solver_proportional.conf \
   test_ats_solver_mlp.conf \
-  test_ats_solver_ril.conf 
+  test_ats_solver_ril.conf \
+  perf_ats_solver_mlp.conf \
+  perf_ats_solver_proportional.conf \
+  perf_ats_solver_ril.conf \
+  perf_ats_solver.conf
Unnamed repository; edit this file 'description' to name the repository.