From 6d6736d720ed24492558f5357993beccd1765d9a Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 18 Jul 2011 11:50:32 +0000 Subject: [PATCH] renaming ats files --- src/transport/Makefile.am | 4 +- src/transport/gnunet-service-transport.c | 2 +- ...t_ats.c => gnunet-service-transport_ats.c} | 53 ++----------------- ...t_ats.h => gnunet-service-transport_ats.h} | 0 src/transport/test_transport_ats.c | 2 +- .../test_transport_ats_multiple_peers.c | 2 +- 6 files changed, 10 insertions(+), 53 deletions(-) rename src/transport/{gnunet_transport_ats.c => gnunet-service-transport_ats.c} (98%) rename src/transport/{gnunet_transport_ats.h => gnunet-service-transport_ats.h} (100%) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 0f0444f52..daffb6484 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -20,7 +20,7 @@ if HAVE_MHD endif if HAVE_LIBGLPK - TRANSPORT_ATS_SRC = gnunet_transport_ats.c + TRANSPORT_ATS_SRC = gnunet-service-transport_ats.c endif if USE_COVERAGE @@ -318,7 +318,7 @@ TESTS = \ endif test_transport_ats_SOURCES = \ - test_transport_ats.c gnunet_transport_ats.c + test_transport_ats.c $(TRANSPORT_ATS_SRC) test_transport_ats_LDADD = -lm \ $(top_builddir)/src/transport/libgnunettransportnew.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 43b988f83..4c6fc8993 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -37,7 +37,7 @@ #include "gnunet_service_lib.h" #include "gnunet_signatures.h" #include "gnunet_transport_plugin.h" -#include "gnunet_transport_ats.h" +#include "gnunet-service-transport_ats.h" #include "transport.h" diff --git a/src/transport/gnunet_transport_ats.c b/src/transport/gnunet-service-transport_ats.c similarity index 98% rename from src/transport/gnunet_transport_ats.c rename to src/transport/gnunet-service-transport_ats.c index e83549f7e..acbc3878c 100644 --- a/src/transport/gnunet_transport_ats.c +++ b/src/transport/gnunet-service-transport_ats.c @@ -25,12 +25,16 @@ * */ -#include "gnunet_transport_ats.h" + +#include "gnunet-service-transport_ats.h" #include "gnunet_transport_service.h" #include "gnunet_statistics_service.h" #include "gnunet_container_lib.h" + + + /* LP/MIP problem object */ #if !HAVE_LIBGLPK @@ -482,12 +486,6 @@ struct ATS_Handle * ats_init (double D, GNUNET_TRANSPORT_ATS_AddressNotification address_not, GNUNET_TRANSPORT_ATS_ResultCallback res_cb) { - -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return NULL; -#endif - struct ATS_Handle * ats = NULL; ats = GNUNET_malloc(sizeof (struct ATS_Handle)); @@ -535,11 +533,6 @@ int ats_create_problem (struct ATS_Handle *ats, struct ATS_mechanism *mechanisms, int c_m) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return GNUNET_SYSERR; -#endif - if ((c_p == 0) || (c_m == 0)) return GNUNET_SYSERR; @@ -1011,11 +1004,6 @@ int ats_create_problem (struct ATS_Handle *ats, void ats_delete_problem (struct ATS_Handle * ats) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return; -#endif - #if DEBUG_ATS GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Deleting problem\n"); #endif @@ -1090,12 +1078,6 @@ void ats_solve_problem (struct ATS_Handle * ats, unsigned int c_mechs, struct ATS_internals *stat) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return; -#endif - - int result = GNUNET_SYSERR; int lp_solution = GNUNET_SYSERR; int mlp_solution = GNUNET_SYSERR; @@ -1222,11 +1204,6 @@ void ats_solve_problem (struct ATS_Handle * ats, void ats_shutdown (struct ATS_Handle * ats) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return; -#endif - #if DEBUG_ATS GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS shutdown\n"); #endif @@ -1238,11 +1215,6 @@ void ats_shutdown (struct ATS_Handle * ats) void ats_update_problem_qm (struct ATS_Handle * ats) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return; -#endif - int array_index; int row_index; int c, c2; @@ -1334,11 +1306,6 @@ void ats_calculate_bandwidth_distribution (struct ATS_Handle * ats, struct GNUNET_STATISTICS_Handle *stats) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return; -#endif - struct GNUNET_TIME_Absolute start; struct GNUNET_TIME_Relative creation; struct GNUNET_TIME_Relative solving; @@ -1541,11 +1508,6 @@ ats_calculate_bandwidth_distribution (struct ATS_Handle * ats, int ats_evaluate_results (int result, int solution, char * problem) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return GNUNET_NO; -#endif - int cont = GNUNET_NO; #if DEBUG_ATS || VERBOSE_ATS int error_kind = GNUNET_ERROR_TYPE_DEBUG; @@ -1652,11 +1614,6 @@ return cont; void ats_update_problem_cr (struct ATS_Handle * ats) { -#if !HAVE_LIBGLPK - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS not active\n"); - return; -#endif - int array_index; int row_index; int c, c2; diff --git a/src/transport/gnunet_transport_ats.h b/src/transport/gnunet-service-transport_ats.h similarity index 100% rename from src/transport/gnunet_transport_ats.h rename to src/transport/gnunet-service-transport_ats.h diff --git a/src/transport/test_transport_ats.c b/src/transport/test_transport_ats.c index b7e8153d9..c782b97d9 100644 --- a/src/transport/test_transport_ats.c +++ b/src/transport/test_transport_ats.c @@ -22,7 +22,7 @@ * @brief testcase for ats functionality without starting peers */ #include "platform.h" -#include "gnunet_transport_ats.h" +#include "gnunet-service-transport_ats.h" #include "gnunet_configuration_lib.h" #include "gnunet_crypto_lib.h" diff --git a/src/transport/test_transport_ats_multiple_peers.c b/src/transport/test_transport_ats_multiple_peers.c index 6e8752a0b..3ba20455f 100644 --- a/src/transport/test_transport_ats_multiple_peers.c +++ b/src/transport/test_transport_ats_multiple_peers.c @@ -30,7 +30,7 @@ #include "gnunet_testing_lib.h" #include "gnunet_transport_service.h" #include "gauger.h" -#include "gnunet_transport_ats.h" +#include "gnunet-service-transport_ats.h" #define VERBOSE GNUNET_NO -- 2.25.1