[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27753 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27753 - gnunet/src/ats |
Date: |
Fri, 5 Jul 2013 11:56:33 +0200 |
Author: wachs
Date: 2013-07-05 11:56:33 +0200 (Fri, 05 Jul 2013)
New Revision: 27753
Modified:
gnunet/src/ats/perf_ats_mlp.c
gnunet/src/ats/test_ats_mlp.c
gnunet/src/ats/test_ats_simplistic_switch_networks.c
Log:
updating tests to match api
Modified: gnunet/src/ats/perf_ats_mlp.c
===================================================================
--- gnunet/src/ats/perf_ats_mlp.c 2013-07-05 09:55:42 UTC (rev 27752)
+++ gnunet/src/ats/perf_ats_mlp.c 2013-07-05 09:56:33 UTC (rev 27753)
@@ -143,7 +143,7 @@
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 @@
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 @@
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
Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c 2013-07-05 09:55:42 UTC (rev 27752)
+++ gnunet/src/ats/test_ats_mlp.c 2013-07-05 09:56:33 UTC (rev 27753)
@@ -127,7 +127,7 @@
}
-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 @@
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 @@
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 @@
/* 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]);
Modified: gnunet/src/ats/test_ats_simplistic_switch_networks.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic_switch_networks.c 2013-07-05
09:55:42 UTC (rev 27752)
+++ gnunet/src/ats/test_ats_simplistic_switch_networks.c 2013-07-05
09:56:33 UTC (rev 27753)
@@ -133,7 +133,7 @@
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",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27753 - gnunet/src/ats,
gnunet <=