From 13f41d9f0f187394ce3d58842cc36f0dffe4c09a Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 5 Jul 2013 09:56:33 +0000 Subject: updating tests to match api --- src/ats/perf_ats_mlp.c | 26 ++++++++++++++------------ src/ats/test_ats_mlp.c | 10 +++------- src/ats/test_ats_simplistic_switch_networks.c | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c index b6955b766..5f39c24d7 100644 --- a/src/ats/perf_ats_mlp.c +++ b/src/ats/perf_ats_mlp.c @@ -143,7 +143,7 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address) static void normalized_property_changed_cb (void *cls, - const struct ATS_Address *peer, + struct ATS_Address *peer, uint32_t type, double prop_rel) { @@ -184,13 +184,13 @@ perf_create_address (int cp, int ca) static void address_initial_update (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addresses, struct ATS_Address *address) { - ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY); - ats[0].value = htonl (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100)); + GAS_mlp_address_property_changed (mlp, address, + GNUNET_ATS_QUALITY_NET_DELAY, 100, + (double)(100 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100)) / 100); - ats[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE); - ats[1].value = htonl (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 10)); - - GAS_mlp_address_update (mlp, address, 0, GNUNET_YES, ats, 2); + GAS_mlp_address_property_changed (mlp, address, + GNUNET_ATS_QUALITY_NET_DISTANCE, 10, + (double)(100 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100)) / 100); } @@ -204,24 +204,26 @@ update_single_addresses (struct ATS_Address *cur) switch (r_type) { case 0: r_val = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100); - ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY); - ats[0].value = htonl (r_val); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' address %p type %s val %u\n", GNUNET_i2s (&cur->peer), cur, "GNUNET_ATS_QUALITY_NET_DELAY", r_val); + GAS_mlp_address_property_changed (mlp, cur, GNUNET_ATS_QUALITY_NET_DELAY, r_val, + (double)(100 + r_val / 100)); break; case 1: r_val = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 10); - ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE); - ats[0].value = htonl (r_val); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' address %p type %s val %u\n", GNUNET_i2s (&cur->peer), cur, "GNUNET_ATS_QUALITY_NET_DISTANCE", r_val); + GAS_mlp_address_property_changed (mlp, cur, GNUNET_ATS_QUALITY_NET_DISTANCE, r_val, + (double)(100 + r_val) / 100); break; default: break; } - GAS_mlp_address_update (mlp, cur, 0, GNUNET_YES, ats, 1); + GAS_mlp_address_inuse_changed(mlp, cur, 0, GNUNET_YES); + } static void diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c index ea1e5076a..be5e39fcf 100644 --- a/src/ats/test_ats_mlp.c +++ b/src/ats/test_ats_mlp.c @@ -127,7 +127,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } -static const double * +const double * get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id) { return GAS_normalization_get_preferences (id); @@ -139,10 +139,9 @@ get_property_cb (void *cls, const struct ATS_Address *address) return GAS_normalization_get_properties ((struct ATS_Address *) address); } - static void normalized_property_changed_cb (void *cls, - const struct ATS_Address *peer, + struct ATS_Address *peer, uint32_t type, double prop_rel) { @@ -190,7 +189,6 @@ check (void *cls, char *const *args, const char *cfgfile, int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType; unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount]; unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount]; - struct GNUNET_ATS_Information ats; #if !HAVE_LIBGLPK GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed!"); @@ -293,9 +291,7 @@ check (void *cls, char *const *args, const char *cfgfile, /* Updating address 0*/ - ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); - ats.value = htonl (GNUNET_ATS_NET_WAN); - GAS_mlp_address_update (mlp, address[0], 1, GNUNET_NO, &ats, 1); + GAS_mlp_address_change_network(mlp, address[0], GNUNET_ATS_NET_UNSPECIFIED, GNUNET_ATS_NET_WAN); /* Retrieving preferred address for peer and wait for callback */ GAS_mlp_get_preferred_address (mlp, &p[0]); diff --git a/src/ats/test_ats_simplistic_switch_networks.c b/src/ats/test_ats_simplistic_switch_networks.c index 6d1548651..53df468a0 100644 --- a/src/ats/test_ats_simplistic_switch_networks.c +++ b/src/ats/test_ats_simplistic_switch_networks.c @@ -133,7 +133,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, char *text; if (0 == stage) { - GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); + //GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id); if (GNUNET_OK == compare_addresses(address, session, &test_hello_address, test_session)) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback for correct address `%s'\n", -- cgit v1.2.3