#include "gnunet-service-ats_performance.h"
#include "gnunet-service-ats_scheduling.h"
#include "gnunet-service-ats_reservations.h"
+#if HAVE_LIBGLPK
+#include "gnunet-service-ats_addresses_mlp.h"
+#endif
-struct ATS_Address
+enum ATS_Mode
{
- struct GNUNET_PeerIdentity peer;
-
- size_t addr_len;
-
- uint32_t session_id;
-
- uint32_t ats_count;
-
- const void * addr;
-
- char * plugin;
-
- struct GNUNET_ATS_Information * ats;
-
- struct GNUNET_TIME_Relative atsp_latency;
-
- struct GNUNET_BANDWIDTH_Value32NBO atsp_utilization_in;
-
- struct GNUNET_BANDWIDTH_Value32NBO atsp_utilization_out;
-
- uint32_t atsp_distance;
-
- uint32_t atsp_cost_wan;
-
- uint32_t atsp_cost_lan;
-
- uint32_t atsp_cost_wlan;
-
- struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in;
-
- struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out;
-
/**
- * Is this the active address for this peer?
+ * Assign each peer an equal amount of bandwidth (bw)
+ *
+ * bw_per_peer = bw_total / #active addresses
*/
- int active;
+ SIMPLE,
+ /**
+ * Use MLP solver to assign bandwidth
+ */
+ MLP
};
+static struct GNUNET_CONTAINER_MultiHashMap *addresses;
-static struct GNUNET_CONTAINER_MultiHashMap * addresses;
+#if HAVE_LIBGLPK
+static struct GAS_MLP_Handle *mlp;
+#endif
-static unsigned long long total_quota_in;
+static unsigned long long wan_quota_in;
-static unsigned long long total_quota_out;
+static unsigned long long wan_quota_out;
static unsigned int active_addr_count;
+static int ats_mode;
+
/**
* Update a bandwidth assignment for a peer. This trivial method currently
* @param value the 'struct ATS_Address'
* @return GNUNET_OK (continue to iterate)
*/
-static int
-update_bw_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+static int
+update_bw_it (void *cls, const GNUNET_HashCode * key, void *value)
{
struct ATS_Address *aa = value;
+
+ /* Simple method */
if (GNUNET_YES != aa->active)
return GNUNET_OK;
GNUNET_assert (active_addr_count > 0);
- aa->assigned_bw_in.value__ = htonl (total_quota_in / active_addr_count);
- aa->assigned_bw_out.value__ = htonl (total_quota_out / active_addr_count);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "New bandwidth for peer %s is %u/%u\n",
- GNUNET_i2s (&aa->peer),
- ntohl (aa->assigned_bw_in.value__),
- ntohl (aa->assigned_bw_out.value__));
- GAS_scheduling_transmit_address_suggestion (&aa->peer,
- aa->plugin,
- aa->addr, aa->addr_len,
- aa->session_id,
- aa->ats, aa->ats_count,
- aa->assigned_bw_out, aa->assigned_bw_in);
- GAS_reservations_set_bandwidth (&aa->peer,
- aa->assigned_bw_in);
- GAS_performance_notify_clients (&aa->peer,
- aa->plugin,
- aa->addr, aa->addr_len,
- aa->ats, aa->ats_count,
- aa->assigned_bw_out, aa->assigned_bw_in);
+ aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count);
+ aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n",
+ GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
+ ntohl (aa->assigned_bw_out.value__));
+ GAS_scheduling_transmit_address_suggestion (&aa->peer, aa->plugin, aa->addr,
+ aa->addr_len, aa->session_id,
+ aa->ats, aa->ats_count,
+ aa->assigned_bw_out,
+ aa->assigned_bw_in);
+ GAS_reservations_set_bandwidth (&aa->peer, aa->assigned_bw_in);
+ GAS_performance_notify_clients (&aa->peer, aa->plugin, aa->addr, aa->addr_len,
+ aa->ats, aa->ats_count, aa->assigned_bw_out,
+ aa->assigned_bw_in);
return GNUNET_OK;
}
recalculate_assigned_bw ()
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Recalculating bandwidth for all active connections\n");
- GNUNET_STATISTICS_update (GSA_stats,
- "# bandwidth recalculations performed",
- 1,
- GNUNET_NO);
- GNUNET_STATISTICS_set (GSA_stats,
- "# active addresses",
- active_addr_count,
- GNUNET_NO);
- GNUNET_CONTAINER_multihashmap_iterate (addresses,
- &update_bw_it,
- NULL);
+ "Recalculating bandwidth for all active connections\n");
+ GNUNET_STATISTICS_update (GSA_stats, "# bandwidth recalculations performed",
+ 1, GNUNET_NO);
+ GNUNET_STATISTICS_set (GSA_stats, "# active addresses", active_addr_count,
+ GNUNET_NO);
+ GNUNET_CONTAINER_multihashmap_iterate (addresses, &update_bw_it, NULL);
+}
+
+/**
+ * Free the given address
+ * @param addr address to destroy
+ */
+static void
+free_address (struct ATS_Address *addr)
+{
+ GNUNET_free_non_null (addr->ats);
+ GNUNET_free (addr->plugin);
+ GNUNET_free (addr);
+}
+
+/**
+ * Create a ATS_address with the given information
+ * @param peer peer
+ * @param plugin_name plugin
+ * @param plugin_addr address
+ * @param plugin_addr_len address length
+ * @param session_id session
+ * @return the ATS_Address
+ */
+static struct ATS_Address *
+create_address (const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name,
+ const void *plugin_addr, size_t plugin_addr_len,
+ uint32_t session_id)
+{
+ struct ATS_Address *aa = NULL;
+
+ aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
+ aa->peer = *peer;
+ aa->addr_len = plugin_addr_len;
+ aa->addr = &aa[1];
+ memcpy (&aa[1], plugin_addr, plugin_addr_len);
+ aa->plugin = GNUNET_strdup (plugin_name);
+ aa->session_id = session_id;
+
+ return aa;
}
int ret;
ret = GNUNET_NO;
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove(addresses,
- &addr->peer.hashPubKey,
- addr));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (addresses,
+ &addr->peer.hashPubKey,
+ addr));
+
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ GAS_mlp_address_delete (mlp, addresses, addr);
+#endif
+
if (GNUNET_YES == addr->active)
{
active_addr_count--;
addr->active = GNUNET_NO;
ret = GNUNET_YES;
}
- GNUNET_free_non_null (addr->ats);
- GNUNET_free (addr->plugin);
- GNUNET_free (addr);
+ free_address (addr);
return ret;
}
struct CompareAddressContext
{
- const struct ATS_Address * search;
- struct ATS_Address * result;
+ const struct ATS_Address *search;
+ struct ATS_Address *result;
};
-static int
-compare_address_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+static int
+compare_address_it (void *cls, const GNUNET_HashCode * key, void *value)
{
- struct CompareAddressContext * cac = cls;
- struct ATS_Address * aa = value;
-
- if ( ( (aa->addr_len != cac->search->addr_len) ||
- (0 != strcmp(aa->plugin, cac->search->plugin)) ||
- (0 != memcmp (aa->addr, cac->search->addr, aa->addr_len)) ) &&
- ( (aa->session_id != cac->search->session_id) ||
- (cac->search->session_id == 0) ))
+ struct CompareAddressContext *cac = cls;
+ struct ATS_Address *aa = value;
+
+ if (((aa->addr_len != cac->search->addr_len) ||
+ (0 != strcmp (aa->plugin, cac->search->plugin)) ||
+ (0 != memcmp (aa->addr, cac->search->addr, aa->addr_len))) &&
+ ((aa->session_id != cac->search->session_id) ||
+ (cac->search->session_id == 0)))
return GNUNET_YES;
cac->result = aa;
return GNUNET_NO;
/**
- * Find an existing equivalent address record.
+ * Find an existing equivalent address record.
* Compares by peer identity and network address OR by session ID
* (one of the two must match).
*
*/
struct ATS_Address *
find_address (const struct GNUNET_PeerIdentity *peer,
- const struct ATS_Address * addr)
+ const struct ATS_Address *addr)
{
struct CompareAddressContext cac;
cac.result = NULL;
cac.search = addr;
- GNUNET_CONTAINER_multihashmap_get_multiple(addresses,
- &peer->hashPubKey,
- compare_address_it,
- &cac);
+ GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+ &compare_address_it, &cac);
return cac.result;
}
void
GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
- const char *plugin_name,
- const void *plugin_addr, size_t plugin_addr_len,
- uint32_t session_id,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t atsi_count)
+ const char *plugin_name, const void *plugin_addr,
+ size_t plugin_addr_len, uint32_t session_id,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count)
{
- struct ATS_Address * aa;
- struct ATS_Address * old;
+ struct ATS_Address *aa;
+ struct ATS_Address *old;
uint32_t i;
- aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len);
- aa->ats = GNUNET_malloc(atsi_count * sizeof (struct GNUNET_ATS_Information));
- aa->peer = *peer;
- aa->addr_len = plugin_addr_len;
+ aa = create_address (peer,
+ plugin_name,
+ plugin_addr, plugin_addr_len,
+ session_id);
+
+ aa->mlp_information = NULL;
+ aa->ats = GNUNET_malloc (atsi_count * sizeof (struct GNUNET_ATS_Information));
aa->ats_count = atsi_count;
memcpy (aa->ats, atsi, atsi_count * sizeof (struct GNUNET_ATS_Information));
- aa->addr = &aa[1];
- memcpy (&aa[1], plugin_addr, plugin_addr_len);
- aa->plugin = GNUNET_strdup (plugin_name);
- aa->session_id = session_id;
+
old = find_address (peer, aa);
if (old == NULL)
{
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (addresses,
- &peer->hashPubKey,
- aa,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Added new address for peer `%s' %X\n",
- GNUNET_i2s (peer), aa);
+ &peer->hashPubKey, aa,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' %X\n",
+ GNUNET_i2s (peer), aa);
old = aa;
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Updated existing address for peer `%s' %X \n",
- GNUNET_i2s (peer), old);
+ "Updated existing address for peer `%s' %X \n",
+ GNUNET_i2s (peer), old);
GNUNET_free_non_null (old->ats);
old->session_id = session_id;
old->ats = NULL;
GNUNET_free (aa->plugin);
GNUNET_free (aa);
}
- for (i=0;i<atsi_count;i++)
+ for (i = 0; i < atsi_count; i++)
switch (ntohl (atsi[i].type))
{
case GNUNET_ATS_UTILIZATION_UP:
case GNUNET_ATS_COST_WLAN:
old->atsp_cost_wlan = ntohl (atsi[i].value);
break;
+ case GNUNET_ATS_NETWORK_TYPE:
+ old->atsp_network_type = ntohl (atsi[i].value);
+ break;
+
default:
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Received unsupported ATS type %u\n",
- ntohl (atsi[i].type));
+ "Received unsupported ATS type %u\n", ntohl (atsi[i].type));
GNUNET_break (0);
break;
}
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ GAS_mlp_address_update (mlp, addresses, old);
+#endif
}
-void
-GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
- const char *plugin_name,
- const void *plugin_addr, size_t plugin_addr_len,
- uint32_t session_id)
+/**
+ * Delete an address
+ *
+ * If session != 0, just the session is deleted, the address itself still exists
+ * If session == 0, remove full address
+ * If session == 0 and addrlen == 0, destroy inbound address
+ *
+ * @param cls unused
+ * @param key unused
+ * @param value the 'struct ATS_Address'
+ * @return GNUNET_OK (continue to iterate)
+ */
+static int
+destroy_by_session_id (void *cls, const GNUNET_HashCode * key, void *value)
{
- struct ATS_Address aa;
- struct ATS_Address *res;
-
- aa.peer = *peer;
- aa.addr_len = plugin_addr_len;
- aa.addr = plugin_addr;
- aa.plugin = (char*) plugin_name;
- aa.session_id = session_id;
- res = find_address (peer, &aa);
- if (res == NULL)
+ const struct ATS_Address *info = cls;
+ struct ATS_Address *aa = value;
+
+ GNUNET_assert (0 ==
+ memcmp (&aa->peer, &info->peer,
+ sizeof (struct GNUNET_PeerIdentity)));
+ /* session == 0, remove full address */
+ if ((info->session_id == 0) && (0 == strcmp (info->plugin, aa->plugin)) &&
+ (aa->addr_len == info->addr_len) &&
+ (0 == memcmp (info->addr, aa->addr, aa->addr_len)))
{
- /* we don't even know this one, can this happen? */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to delete unknown address for peer `%s'\n",
- GNUNET_i2s (peer));
- return;
- }
- if ( (aa.session_id == session_id) &&
- (session_id != 0) &&
- (res->addr_len > 0) )
- {
- /* just session died */
- res->session_id = 0;
- if (GNUNET_YES == res->active)
- {
- res->active = GNUNET_NO;
- active_addr_count--;
+ "Deleting address for peer `%s': `%s'\n",
+ GNUNET_i2s (&aa->peer), aa->plugin);
+ if (GNUNET_YES == destroy_address (aa))
recalculate_assigned_bw ();
- }
- return;
+ return GNUNET_OK;
}
- /* destroy address entirely (either was only session or was
- not even with a session) */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Deleting address for peer `%s': `%s'\n",
- GNUNET_i2s (peer), plugin_name);
- if (GNUNET_YES == destroy_address (res))
+ /* session != 0, just remove session */
+ if (aa->session_id != info->session_id)
+ return GNUNET_OK; /* irrelevant */
+ if (aa->session_id != 0)
+ GNUNET_break (0 == strcmp (info->plugin, aa->plugin));
+ /* session died */
+ aa->session_id = 0;
+
+ if (GNUNET_YES == aa->active)
+ {
+ aa->active = GNUNET_NO;
+ active_addr_count--;
recalculate_assigned_bw ();
+ }
+
+ /* session == 0 and addrlen == 0 : destroy address */
+ if (aa->addr_len == 0)
+ {
+ (void) destroy_address (aa);
+ }
+ else
+ {
+ /* session was set to 0, update address */
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ GAS_mlp_address_update (mlp, addresses, aa);
+#endif
+ }
+
+ return GNUNET_OK;
+}
+
+void
+GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name, const void *plugin_addr,
+ size_t plugin_addr_len, uint32_t session_id)
+{
+ struct ATS_Address *aa;
+
+ GNUNET_break (0 < strlen (plugin_name));
+ aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+
+ GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+ &destroy_by_session_id, aa);
+
+ free_address (aa);
}
/**
* Find a "good" address to use for a peer. If we already have an existing
* address, we stick to it. Otherwise, we pick by lowest distance and then
- * by lowest latency.
- *
+ * by lowest latency.
+ *
* @param cls the 'struct ATS_Address**' where we store the result
* @param key unused
* @param value another 'struct ATS_Address*' to consider using
* @return GNUNET_OK (continue to iterate)
*/
-static int
-find_address_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+static int
+find_address_it (void *cls, const GNUNET_HashCode * key, void *value)
{
struct ATS_Address **ap = cls;
- struct ATS_Address * aa = (struct ATS_Address *) value;
- struct ATS_Address * ab = *ap;
+ struct ATS_Address *aa = (struct ATS_Address *) value;
+ struct ATS_Address *ab = *ap;
if (NULL == ab)
{
*ap = aa;
return GNUNET_OK;
}
- if ( (ntohl (ab->assigned_bw_in.value__) == 0) &&
- (ntohl (aa->assigned_bw_in.value__) > 0) )
+ if ((ntohl (ab->assigned_bw_in.value__) == 0) &&
+ (ntohl (aa->assigned_bw_in.value__) > 0))
{
/* stick to existing connection */
*ap = aa;
}
+void
+GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name, const void *plugin_addr,
+ size_t plugin_addr_len, uint32_t session_id, int in_use)
+{
+#if DEBUG_ATS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message for peer `%s': %i\n", "ADDRESS_IN_USE",
+ GNUNET_i2s (peer), in_use);
+#endif
+
+ struct ATS_Address *aa;
+ struct ATS_Address *old;
+
+ aa = create_address(peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+ old = find_address (peer, aa);
+ free_address (aa);
+
+ GNUNET_assert (old != NULL);
+ GNUNET_assert (in_use != old->used);
+ old->used = in_use;
+
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ GAS_mlp_address_update (mlp, addresses, old);
+#endif
+}
+
void
GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
{
- struct ATS_Address * aa;
+ struct ATS_Address *aa;
aa = NULL;
- GNUNET_CONTAINER_multihashmap_get_multiple (addresses,
- &peer->hashPubKey,
- &find_address_it,
- &aa);
+ GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey,
+ &find_address_it, &aa);
if (aa == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Cannot suggest address for peer `%s'\n",
- GNUNET_i2s (peer));
- return;
+ "Cannot suggest address for peer `%s'\n", GNUNET_i2s (peer));
+ return;
}
if (aa->active == GNUNET_NO)
{
else
{
/* just to be sure... */
- GAS_scheduling_transmit_address_suggestion (peer, aa->plugin,
- aa->addr, aa->addr_len,
- aa->session_id,
- aa->ats, aa->ats_count,
- aa->assigned_bw_out, aa->assigned_bw_in);
+ GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, aa->addr,
+ aa->addr_len, aa->session_id,
+ aa->ats, aa->ats_count,
+ aa->assigned_bw_out,
+ aa->assigned_bw_in);
}
}
// not with 'addresses' in the future...
void
GAS_addresses_change_preference (const struct GNUNET_PeerIdentity *peer,
- enum GNUNET_ATS_PreferenceKind kind,
- float score)
+ enum GNUNET_ATS_PreferenceKind kind,
+ float score)
{
// do nothing for now...
}
+
/**
* Initialize address subsystem.
*
* @param cfg configuration to use
+ * @param stats the statistics handle to use
*/
void
-GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
+GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_STATISTICS_Handle *stats)
{
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg,
- "core",
- "TOTAL_QUOTA_IN",
- &total_quota_in));
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+ "WAN_QUOTA_IN",
+ &wan_quota_in));
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg,
- "core",
- "TOTAL_QUOTA_OUT",
- &total_quota_out));
- addresses = GNUNET_CONTAINER_multihashmap_create(128);
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+ "WAN_QUOTA_OUT",
+ &wan_quota_out));
+
+ switch (GNUNET_CONFIGURATION_get_value_yesno (cfg, "ats", "MLP"))
+ {
+ /* MLP = YES */
+ case GNUNET_YES:
+#if HAVE_LIBGLPK
+ ats_mode = MLP;
+ /* Init the MLP solver with default values */
+ mlp = GAS_mlp_init (cfg, stats, MLP_MAX_EXEC_DURATION, MLP_MAX_ITERATIONS);
+ break;
+#else
+
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP mode was configured, but libglpk is not installed, switching to simple mode");
+ ats_mode = SIMPLE;
+ break;
+#endif
+ /* MLP = NO */
+ case GNUNET_NO:
+ ats_mode = SIMPLE;
+ break;
+ /* No configuration value */
+ case GNUNET_SYSERR:
+ ats_mode = SIMPLE;
+ break;
+ default:
+ break;
+ }
+
+ addresses = GNUNET_CONTAINER_multihashmap_create (128);
}
* @param value the 'struct ATS_Address' to free
* @return GNUNET_OK (continue to iterate)
*/
-static int
-free_address_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+static int
+free_address_it (void *cls, const GNUNET_HashCode * key, void *value)
{
- struct ATS_Address * aa = value;
+ struct ATS_Address *aa = value;
destroy_address (aa);
return GNUNET_OK;
GAS_addresses_destroy_all ()
{
if (addresses != NULL)
- GNUNET_CONTAINER_multihashmap_iterate(addresses,
- &free_address_it, NULL);
+ GNUNET_CONTAINER_multihashmap_iterate (addresses, &free_address_it, NULL);
GNUNET_assert (active_addr_count == 0);
}
GAS_addresses_destroy_all ();
GNUNET_CONTAINER_multihashmap_destroy (addresses);
addresses = NULL;
+#if HAVE_LIBGLPK
+ if (ats_mode == MLP)
+ {
+ GAS_mlp_done (mlp);
+ }
+#endif
+
}
projects / oweals / gnunet.git / blobdiff