logging on demand + log bandwidth

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

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 3285143aabd81dc8fc5e5c47fc462bc4ff4a7302..58352b94f0cff9f0a568c6c3ce0f6ff05acda992 100644 (file)
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -13,17 +13,31 @@ if USE_COVERAGE
 endif
 
 if HAVE_LIBGLPK
- PERF_MLP_BANDWIDTH = perf_ats_mlp_bandwidth
- PERF_MLP_DELAY = perf_ats_mlp_delay
+ PERF_MLP =  perf_ats_mlp_transport_none \
+ perf_ats_mlp_core_none \
+ perf_ats_mlp_transport_bandwidth \
+ perf_ats_mlp_core_bandwidth \
+ perf_ats_mlp_transport_latency \
+ perf_ats_mlp_core_latency 
 endif
 
 if HAVE_TESTING
 TESTING_TESTS = \
- perf_ats_proportional_bandwidth \
- perf_ats_proportional_delay \
- perf_ats_ril_bandwidth \
- perf_ats_ril_delay \
- $(PERF_MLP_BANDWIDTH) $(PERF_MLP_DELAY)
+ perf_ats_proportional_transport_none \
+ perf_ats_proportional_core_none \
+ perf_ats_proportional_transport_bandwidth \
+ perf_ats_proportional_core_bandwidth \
+ perf_ats_proportional_transport_latency \
+ perf_ats_proportional_core_latency \
+ #$(PERF_MLP)  
+ #perf_ats_mlp_none
+ #perf_ats_mlp_bandwidth
+ #perf_ats_ril_transport_none \
+ #perf_ats_ril_core_none \
+ #perf_ats_ril_transport_bandwidth \
+ #perf_ats_ril_core_bandwidth \
+ #perf_ats_ril_transport_latency \
+ #perf_ats_ril_core_latency 
 endif
 
 check_PROGRAMS = \
@@ -33,60 +47,177 @@ if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
-perf_ats_proportional_bandwidth_SOURCES = \
-  perf_ats.c  
-perf_ats_proportional_bandwidth_LDADD = \
+perf_ats_proportional_core_none_SOURCES = \
+  perf_ats.c perf_ats_logging.c
+perf_ats_proportional_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
 
-perf_ats_proportional_delay_SOURCES = \
-  perf_ats.c  
-perf_ats_proportional_delay_LDADD = \
+perf_ats_proportional_transport_none_SOURCES = \
+  perf_ats.c perf_ats_logging.c
+perf_ats_proportional_transport_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_proportional_core_bandwidth_SOURCES = \
+  perf_ats.c perf_ats_logging.c
+perf_ats_proportional_core_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_proportional_transport_bandwidth_SOURCES = \
+  perf_ats.c perf_ats_logging.c
+perf_ats_proportional_transport_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_proportional_core_latency_SOURCES = \
+  perf_ats.c perf_ats_logging.c
+perf_ats_proportional_core_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_proportional_transport_latency_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_proportional_transport_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
   
 if HAVE_LIBGLPK
-perf_ats_mlp_bandwidth_SOURCES = \
-  perf_ats.c  
-perf_ats_mlp_bandwidth_LDADD = \
+perf_ats_mlp_core_none_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_mlp_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
-  
-perf_ats_mlp_delay_SOURCES = \
-  perf_ats.c  
-perf_ats_mlp_delay_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_mlp_transport_none_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_mlp_transport_none_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_mlp_core_bandwidth_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_mlp_core_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_mlp_transport_bandwidth_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_mlp_transport_bandwidth_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_mlp_core_latency_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_mlp_core_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_mlp_transport_latency_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_mlp_transport_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la  
 endif
 
-perf_ats_ril_bandwidth_SOURCES = \
-  perf_ats.c  
-perf_ats_ril_bandwidth_LDADD = \
+perf_ats_ril_core_none_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_ril_core_none_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la  
-  
-perf_ats_ril_delay_SOURCES = \
-  perf_ats.c  
-perf_ats_ril_delay_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_ril_transport_none_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_ril_transport_none_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_ril_core_bandwidth_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_ril_core_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_ril_transport_bandwidth_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_ril_transport_bandwidth_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_ril_core_latency_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_ril_core_latency_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la    
+
+perf_ats_ril_transport_latency_SOURCES = \
+  perf_ats.c perf_ats_logging.c 
+perf_ats_ril_transport_latency_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/core/libgnunetcore.la
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la  
 
 EXTRA_DIST = \
+  perf_ats_proportional_none.conf \
   perf_ats_proportional_bandwidth.conf \
-  perf_ats_proportional_delay.conf \
+  perf_ats_proportional_latency.conf \
+  perf_ats_mlp_none.conf \
   perf_ats_mlp_bandwidth.conf \
-  perf_ats_mlp_delay.conf \
+  perf_ats_mlp_latency.conf \
+  perf_ats_ril_none.conf \
   perf_ats_ril_bandwidth.conf \
-  perf_ats_ril_delay.conf
+  perf_ats_ril_latency.conf