diff options
| author | Bertrand Marc <beberking@gmail.com> | 2012-06-06 20:47:50 +0200 |
|---|---|---|
| committer | Bertrand Marc <beberking@gmail.com> | 2012-06-06 20:47:50 +0200 |
| commit | 15d0a119987bc62675a17dea2c24b652a42c53e3 (patch) | |
| tree | d6598fb09c24a8004da21bee1a19f3f1ea37c66c /src/ats/test_ats_mlp.c | |
| parent | c47dd4e3165b7894669d8f7f800bac75ac8ad95c (diff) | |
| parent | 740b30688bd745a527f96f9116c19acb3480971a (diff) | |
Merge tag 'upstream/0.9.3'
Upstream version 0.9.3
Diffstat (limited to 'src/ats/test_ats_mlp.c')
| -rw-r--r-- | src/ats/test_ats_mlp.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c index 14df2d0..c467210 100644 --- a/src/ats/test_ats_mlp.c +++ b/src/ats/test_ats_mlp.c @@ -30,9 +30,6 @@ #include "gnunet_ats_service.h" #include "gnunet-service-ats_addresses_mlp.h" -#define VERBOSE GNUNET_YES -#define VERBOSE_ARM GNUNET_NO - #define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3) #define MLP_MAX_ITERATIONS INT_MAX @@ -52,7 +49,7 @@ create_address (struct ATS_Address *addr, char * plugin, int ats_count, struct G addr->mlp_information = NULL; addr->next = NULL; addr->prev = NULL; - addr->plugin = strdup (plugin); + addr->plugin = GNUNET_strdup (plugin); addr->ats_count = ats_count; addr->ats = ats; } @@ -75,6 +72,7 @@ check (void *cls, char *const *args, const char *cfgfile, #endif struct ATS_Address addr[10]; struct ATS_PreferedAddress *res[10]; + struct GAS_MLP_SolutionContext ctx; stats = GNUNET_STATISTICS_create("ats", cfg); @@ -140,7 +138,9 @@ check (void *cls, char *const *args, const char *cfgfile, GAS_mlp_address_update (mlp, addresses, &addr[2]); GNUNET_assert (mlp->addr_in_problem == 3); - GNUNET_assert (GNUNET_OK == GAS_mlp_solve_problem(mlp)); + GNUNET_assert (GNUNET_OK == GAS_mlp_solve_problem(mlp, &ctx)); + GNUNET_assert (GNUNET_OK == ctx.lp_result); + GNUNET_assert (GNUNET_OK == ctx.mlp_result); res[0] = GAS_mlp_get_preferred_address(mlp, addresses, &p[0]); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound bandwidth: %u Bps\n",res[0]->address->plugin, res[0]->bandwidth_out); @@ -176,11 +176,7 @@ main (int argc, char *argv[]) static char *const argv2[] = { "test_ats_mlp", "-c", "test_ats_api.conf", -#if VERBOSE - "-L", "DEBUG", -#else "-L", "WARNING", -#endif NULL }; |