diff options
| -rw-r--r-- | src/ats/Makefile.am | 4 | ||||
| -rw-r--r-- | src/ats/perf_ats_mlp.c | 11 | ||||
| -rw-r--r-- | src/ats/test_ats_mlp_update.c | 10 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 93febe47a7..1b7b9d818e 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -215,7 +215,7 @@ test_ats_mlp_LDADD = \ $(top_builddir)/src/ats/libgnunetats.la test_ats_mlp_update_SOURCES = \ - $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c + $(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 \ @@ -224,7 +224,7 @@ test_ats_mlp_update_LDADD = \ perf_ats_mlp_SOURCES = \ - $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c + $(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 \ diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c index 5554bd9795..eb9e504a24 100644 --- a/src/ats/perf_ats_mlp.c +++ b/src/ats/perf_ats_mlp.c @@ -55,7 +55,7 @@ #include "gnunet_util_lib.h" #include "gnunet_statistics_service.h" #include "gnunet_ats_service.h" -#include "gnunet-service-ats_addresses_mlp.h" +#include "gnunet-service-ats-solver_mlp.h" #include "gnunet-service-ats_normalization.h" #include "test_ats_api_common.h" @@ -141,6 +141,13 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address) } +static const double * +get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id) +{ + return GAS_normalization_get_preferences (id); +} + + static void perf_create_peer (int cp) { @@ -298,7 +305,7 @@ check (void *cls, char *const *args, const char *cfgfile, /* Init MLP solver */ mlp = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in, - GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL); + GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL, &get_preferences_cb, NULL); if (NULL == mlp) { GNUNET_break (0); diff --git a/src/ats/test_ats_mlp_update.c b/src/ats/test_ats_mlp_update.c index de66dd2c0b..dac78ae89e 100644 --- a/src/ats/test_ats_mlp_update.c +++ b/src/ats/test_ats_mlp_update.c @@ -28,7 +28,8 @@ #include "gnunet_util_lib.h" #include "gnunet_statistics_service.h" #include "gnunet_ats_service.h" -#include "gnunet-service-ats_addresses_mlp.h" +#include "gnunet-service-ats-solver_mlp.h" +#include "gnunet-service-ats_normalization.h" #include "test_ats_api_common.h" /** @@ -131,6 +132,11 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) end_now (1); } +static const double * +get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id) +{ + return GAS_normalization_get_preferences (id); +} static void bandwidth_changed_cb (void *cls, struct ATS_Address *address) @@ -193,7 +199,7 @@ check (void *cls, char *const *args, const char *cfgfile, /* Init MLP solver */ mlp = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in, - GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL); + GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL, &get_preferences_cb, NULL); if (NULL == mlp) { GNUNET_break (0); |