#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 "gnunet_ats_service.h"
#include "test_ats_api_common.h"
/**
GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-#if 0
-
-#define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
-#define MLP_MAX_ITERATIONS INT_MAX
-
-static void
-set_ats (struct GNUNET_ATS_Information *ats, uint32_t type, uint32_t value)
-{
- ats->type = type;
- ats->value = value;
-}
-
-#endif
-
int addr_it (void *cls,
const struct GNUNET_HashCode * key,
void *value)
{
struct ATS_Address *address = (struct ATS_Address *) value;
+ GAS_mlp_address_delete (mlp, address, GNUNET_NO);
GNUNET_CONTAINER_multihashmap_remove (addresses, key, value);
GNUNET_free (address);
return GNUNET_OK;
GNUNET_STATISTICS_destroy(stats, GNUNET_NO);
stats = NULL;
}
- if (NULL != mlp)
- {
- GAS_mlp_done (mlp);
- mlp = NULL;
- }
if (NULL != addresses)
{
GNUNET_CONTAINER_multihashmap_iterate (addresses, &addr_it, NULL);
GNUNET_CONTAINER_multihashmap_destroy (addresses);
addresses = NULL ;
}
+ if (NULL != mlp)
+ {
+ GAS_mlp_done (mlp);
+ mlp = NULL;
+ }
+ GAS_normalization_stop ();
ret = res;
}
static void
end_correctly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Test ending with success\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Test ending with success\n"));
end_now (0);
}
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_break (0);
timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Test ending with timeout\n"));
end_now (1);
}
+const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
+{
+ return GAS_normalization_get_preferences (id);
+}
+
+const double *
+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,
+ struct ATS_Address *peer,
+ uint32_t type,
+ double prop_rel)
+{
+ /* TODO */
+}
+
+
static void
bandwidth_changed_cb (void *cls, struct ATS_Address *address)
{
if ((1 == cb_p0) && (1 == cb_p1))
GNUNET_SCHEDULER_add_now (&end_correctly, NULL);
- else if ((1 > cb_p0) || (1 > cb_p1))
+ else if ((1 < cb_p0) || (1 < cb_p1))
+ {
+ GNUNET_break (0);
GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ }
}
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!");
end_now (1);
return;
}
-
+ GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL);
/* Setup address hashmap */
addresses = GNUNET_CONTAINER_multihashmap_create (10, 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);
GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[0],
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
/* Adding address 0 */
- GAS_mlp_address_add (mlp, addresses, address[0]);
+ GAS_mlp_address_add (mlp, address[0], GNUNET_ATS_NET_UNSPECIFIED);
/* Create address 1 */
address[1] = create_address (&p[0], "test_plugin1", "test_addr1", strlen("test_addr1")+1, 0);
GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[1],
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
/* Adding address 1*/
- GAS_mlp_address_add (mlp, addresses, address[1]);
+ GAS_mlp_address_add (mlp, address[1], GNUNET_ATS_NET_UNSPECIFIED);
/* Create address 3 */
GNUNET_CONTAINER_multihashmap_put (addresses, &p[1].hashPubKey, address[2],
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
/* Adding address 3*/
- GAS_mlp_address_add (mlp, addresses, address[2]);
+ GAS_mlp_address_add (mlp, address[2], GNUNET_ATS_NET_UNSPECIFIED);
/* Updating address 0*/
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl (GNUNET_ATS_NET_WAN);
- GAS_mlp_address_update (mlp, addresses, 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, addresses, &p[0]);
- GAS_mlp_get_preferred_address (mlp, addresses, &p[1]);
+ GAS_mlp_get_preferred_address (mlp, &p[0]);
+ GAS_mlp_get_preferred_address (mlp, &p[1]);
+ mlp->write_mip_mps = GNUNET_NO;
+ mlp->write_mip_sol = GNUNET_NO;
-#if 0
- /* Updating address 1*/
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl (GNUNET_ATS_NET_WAN);
- GAS_mlp_address_update (mlp, addresses, address[1], 1, GNUNET_NO, &ats, 1);
- GAS_mlp_address_delete (mlp, addresses, address[0], GNUNET_NO);
-#endif
- GAS_mlp_solve_problem (mlp, addresses);
+ GAS_mlp_solve_problem (mlp);
}
projects / oweals / gnunet.git / blobdiff