#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"
#define PEERS_START 100
GAS_mlp_done (mlp);
mlp = NULL;
}
-
+ GAS_normalization_stop();
ret = res;
}
}
+static void
+normalized_property_changed_cb (void *cls,
+ struct ATS_Address *peer,
+ uint32_t type,
+ double prop_rel)
+{
+ /* TODO */
+}
+
+const double *
+get_property_cb (void *cls, const struct ATS_Address *address)
+{
+ return GAS_normalization_get_properties ((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)
{
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));
-
- 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_property_changed (mlp, address,
+ GNUNET_ATS_QUALITY_NET_DELAY, 100,
+ (double)(100 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100)) / 100);
- GAS_mlp_address_update (mlp, addresses, 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);
}
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, addresses, cur, 0, GNUNET_YES, ats, 1);
+ GAS_mlp_address_inuse_changed(mlp, cur, GNUNET_YES);
+
}
static void
end_now (1);
return;
}
-
+ GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL);
/* Load quotas */
if (GNUNET_ATS_NetworkTypeCount != load_quotas (cfg, quotas_out, quotas_in,
GNUNET_ATS_NetworkTypeCount))
addresses = GNUNET_CONTAINER_multihashmap_create (N_address, GNUNET_NO);
/* Init MLP solver */
- mlp = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in,
- GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL);
+ mlp = GAS_mlp_init (cfg, stats, addresses,
+ quotas, quotas_out, quotas_in,
+ GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL,
+ &get_preferences_cb, NULL,
+ &get_property_cb, NULL);
if (NULL == mlp)
{
GNUNET_break (0);
{
cur_addr = perf_create_address(cp, ca);
/* add address */
- GAS_mlp_address_add (mlp, addresses, cur_addr);
+ GAS_mlp_address_add (mlp, cur_addr, GNUNET_ATS_NET_UNSPECIFIED);
address_initial_update (mlp, addresses, cur_addr);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding address for peer %u address %u: \n", cp, ca);
}
- GAS_mlp_get_preferred_address( mlp, addresses, &peers[cp].id);
+ GAS_mlp_get_preferred_address( mlp, &peers[cp].id);
/* solve */
if (cp + 1 >= N_peers_start)
{
+
+ update_mip_dur = GNUNET_TIME_UNIT_FOREVER_REL;
+ update_lp_dur = GNUNET_TIME_UNIT_FOREVER_REL;
+ update_build_dur = GNUNET_TIME_UNIT_FOREVER_REL;
+ update_mip_presolv = GNUNET_SYSERR;
+ update_lp_presolv = GNUNET_SYSERR;
+ update_mip_res = GNUNET_SYSERR;
+ update_lp_res = GNUNET_SYSERR;
/* Solve the full problem */
- GAS_mlp_solve_problem (mlp, addresses);
+ GAS_mlp_solve_problem (mlp);
full_lp_res = mlp->ps.lp_res;
full_mip_res = mlp->ps.mip_res;
full_lp_presolv = mlp->ps.lp_presolv;
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating problem with %u peers and %u addresses\n", cp + 1, ca);
update_addresses (cp + 1, ca, opt_update_quantity);
- GAS_mlp_solve_problem (mlp, addresses);
- GAS_mlp_solve_problem (mlp, addresses);
+ GAS_mlp_solve_problem (mlp);
+ GAS_mlp_solve_problem (mlp);
update_lp_res = mlp->ps.lp_res;
update_mip_res = mlp->ps.mip_res;
update_lp_presolv = mlp->ps.lp_presolv;
{
for (cur = peers[cp].head; cur != NULL; cur = next)
{
- GAS_mlp_address_delete (mlp, addresses, cur, GNUNET_NO);
+ GAS_mlp_address_delete (mlp, cur, GNUNET_NO);
next = cur->next;
GNUNET_CONTAINER_DLL_remove (peers[cp].head, peers[cp].tail, cur);
GNUNET_free (cur);