[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35162 - gnunet/src/ats
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r35162 - gnunet/src/ats |
|
Date: |
Sun, 8 Feb 2015 17:24:42 +0100 |
Author: grothoff
Date: 2015-02-08 17:24:42 +0100 (Sun, 08 Feb 2015)
New Revision: 35162
Modified:
gnunet/src/ats/gnunet-ats-solver-eval.c
gnunet/src/ats/gnunet-service-ats_plugins.c
gnunet/src/ats/perf_ats_solver.c
gnunet/src/ats/plugin_ats_mlp.c
gnunet/src/ats/plugin_ats_proportional.c
gnunet/src/ats/plugin_ats_ril.c
Log:
avoid several linear scans and allocations by combining AddressWrapper and asi
structs
Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c 2015-02-08 15:50:13 UTC (rev
35161)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c 2015-02-08 16:24:42 UTC (rev
35162)
@@ -2251,7 +2251,7 @@
op->address_id,
op->peer_id);
- sh->sf->s_del (sh->sf->cls, a->ats_addr, GNUNET_NO);
+ sh->sf->s_del (sh->sf->cls, a->ats_addr);
if (NULL != l)
{
Modified: gnunet/src/ats/gnunet-service-ats_plugins.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_plugins.c 2015-02-08 15:50:13 UTC (rev
35161)
+++ gnunet/src/ats/gnunet-service-ats_plugins.c 2015-02-08 16:24:42 UTC (rev
35162)
@@ -495,8 +495,7 @@
GAS_plugin_delete_address (struct ATS_Address *address)
{
sf->s_del (sf->cls,
- address,
- GNUNET_NO);
+ address);
}
Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c 2015-02-08 15:50:13 UTC (rev 35161)
+++ gnunet/src/ats/perf_ats_solver.c 2015-02-08 16:24:42 UTC (rev 35162)
@@ -866,6 +866,15 @@
}
+static unsigned int
+get_connectivity_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ return GNUNET_CONTAINER_multipeermap_contains (ph.addresses,
+ peer);
+}
+
+
/**
* Evaluate average results for all iterations
*/
@@ -1060,7 +1069,7 @@
GNUNET_CONTAINER_multipeermap_remove (ph.addresses,
pid,
cur));
- ph.sf->s_del (ph.sf->cls, cur, GNUNET_NO);
+ ph.sf->s_del (ph.sf->cls, cur);
GNUNET_free_non_null (cur->atsi);
GNUNET_free (cur);
return GNUNET_OK;
@@ -1292,6 +1301,7 @@
ph.addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
ph.env.addresses = ph.addresses;
ph.env.bandwidth_changed_cb = bandwidth_changed_cb;
+ ph.env.get_connectivity = &get_connectivity_cb;
ph.env.get_preferences = &get_preferences_cb;
ph.env.network_count = GNUNET_ATS_NetworkTypeCount;
ph.env.info_cb = &solver_info_cb;
Modified: gnunet/src/ats/plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/plugin_ats_mlp.c 2015-02-08 15:50:13 UTC (rev 35161)
+++ gnunet/src/ats/plugin_ats_mlp.c 2015-02-08 16:24:42 UTC (rev 35162)
@@ -2121,22 +2121,17 @@
*
* @param solver the MLP Handle
* @param address the address to delete
- * @param session_only delete only session not whole address
*/
static void
GAS_mlp_address_delete (void *solver,
- struct ATS_Address *address,
- int session_only)
+ struct ATS_Address *address)
{
struct GAS_MLP_Handle *mlp = solver;
struct MLP_information *mlpi;
int was_active;
- GNUNET_assert (NULL != solver);
- GNUNET_assert (NULL != address);
-
mlpi = address->solver_information;
- if ((GNUNET_NO == session_only) && (NULL != mlpi))
+ if (NULL != mlpi)
{
/* Remove full address */
GNUNET_free (mlpi);
@@ -2153,14 +2148,13 @@
&address->peer))
{
LOG (GNUNET_ERROR_TYPE_INFO,
- "Deleting %s for peer `%s' without address request \n",
- (session_only == GNUNET_YES) ? "session" : "address",
+ "Deleting address for peer `%s' without address request \n",
GNUNET_i2s(&address->peer));
return;
}
- LOG (GNUNET_ERROR_TYPE_INFO, "Deleting %s for peer `%s' with address request
\n",
- (session_only == GNUNET_YES) ? "session" : "address",
- GNUNET_i2s(&address->peer));
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Deleting address for peer `%s' with address request \n",
+ GNUNET_i2s (&address->peer));
/* Problem size changed: new address for peer with pending request */
mlp->stat_mlp_prob_changed = GNUNET_YES;
@@ -2176,8 +2170,6 @@
mlp->env->bandwidth_changed_cb (mlp->env->cls, address);
}
}
-
- return;
}
Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c 2015-02-08 15:50:13 UTC (rev
35161)
+++ gnunet/src/ats/plugin_ats_proportional.c 2015-02-08 16:24:42 UTC (rev
35162)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -211,14 +211,18 @@
*/
/**
- * FIXME.
+ * Default value to assume for the proportionality factor,
+ * if none is given in the configuration.
*/
#define PROPORTIONALITY_FACTOR 2.0
/**
- * Wrapper for addresses to store them in a
- * `struct Network`'s linked list
+ * Address information stored for the proportional solver in the
+ * `solver_information` member of `struct GNUNET_ATS_Address`.
+ *
+ * They are also stored in the respective `struct Network`'s linked
+ * list.
*/
struct AddressWrapper
{
@@ -236,6 +240,27 @@
* The address
*/
struct ATS_Address *addr;
+
+ /**
+ * Network scope this address is in
+ */
+ struct Network *network;
+
+ /**
+ * Inbound quota
+ */
+ uint32_t calculated_quota_in;
+
+ /**
+ * Outbound quota
+ */
+ uint32_t calculated_quota_out;
+
+ /**
+ * When was this address activated
+ */
+ struct GNUNET_TIME_Absolute activated;
+
};
@@ -314,31 +339,6 @@
struct Network *network_entries;
/**
- * Bulk lock
- */
- int bulk_lock;
-
- /**
- * Number of changes while solver was locked
- */
- int bulk_requests;
-
- /**
- * Total number of addresses for solver
- */
- unsigned int total_addresses;
-
- /**
- * Number of active addresses for solver
- */
- unsigned int active_addresses;
-
- /**
- * Number of networks in @a network_entries
- */
- unsigned int network_count;
-
- /**
* Proportionality factor
*/
double prop_factor;
@@ -347,33 +347,27 @@
* Stability factor
*/
double stability_factor;
-};
-/**
- * Address information stored in the solver
- */
-struct AddressSolverInformation
-{
/**
- * Network scope this address is in
+ * Bulk lock counter. If zero, we are not locked.
*/
- struct Network *network;
+ unsigned int bulk_lock;
/**
- * Inbound quota
+ * Number of changes made while solver was locked. We really only
+ * use 0/non-zero to check on unlock if we have to run the update.
*/
- uint32_t calculated_quota_in;
+ unsigned int bulk_requests;
/**
- * Outbound quota
+ * Number of active addresses for solver
*/
- uint32_t calculated_quota_out;
+ unsigned int active_addresses;
/**
- * When was this address activated
+ * Number of networks in @a network_entries
*/
- struct GNUNET_TIME_Absolute activated;
-
+ unsigned int network_count;
};
@@ -424,13 +418,6 @@
GNUNET_free (s->network_entries[c].stat_total);
GNUNET_free (s->network_entries[c].stat_active);
}
- if (s->total_addresses > 0)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Had %u addresses not deleted during shutdown\n",
- s->total_addresses);
- // GNUNET_break(0);
- }
if (s->active_addresses > 0)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -485,8 +472,7 @@
distribute_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
struct Network *net)
{
- struct AddressSolverInformation *asi;
- struct AddressWrapper *cur_address;
+ struct AddressWrapper *aw;
unsigned long long remaining_quota_in = 0;
unsigned long long quota_out_used = 0;
unsigned long long remaining_quota_out = 0;
@@ -540,13 +526,13 @@
/* Calculate sum of relative preference for active addresses in this network
*/
count_addresses = 0;
- for (cur_address = net->head; NULL != cur_address; cur_address =
cur_address->next)
+ for (aw = net->head; NULL != aw; aw = aw->next)
{
- if (GNUNET_YES != cur_address->addr->active)
+ if (GNUNET_YES != aw->addr->active)
continue;
peer_relative_prefs = s->env->get_preferences (s->env->cls,
- &cur_address->addr->peer);
+ &aw->addr->peer);
relative_peer_prefence = 0.0;
relative_peer_prefence +=
peer_relative_prefs[GNUNET_ATS_PREFERENCE_BANDWIDTH];
sum_relative_peer_prefences += relative_peer_prefence;
@@ -559,16 +545,16 @@
LOG (GNUNET_ERROR_TYPE_WARNING,
"%s: Counted %u active addresses, but network says to have %u active
addresses\n",
net->desc, count_addresses, net->active_addresses);
- for (cur_address = net->head; NULL != cur_address; cur_address =
cur_address->next)
+ for (aw = net->head; NULL != aw; aw = aw->next)
{
- if (GNUNET_YES != cur_address->addr->active)
+ if (GNUNET_YES != aw->addr->active)
continue;
LOG (GNUNET_ERROR_TYPE_WARNING,
"Active: `%s' `%s' length %u\n",
- GNUNET_i2s (&cur_address->addr->peer),
- cur_address->addr->plugin,
- cur_address->addr->addr_len);
+ GNUNET_i2s (&aw->addr->peer),
+ aw->addr->plugin,
+ aw->addr->addr_len);
}
}
@@ -576,12 +562,12 @@
"Total relative preference %.3f for %u addresses in network %s\n",
sum_relative_peer_prefences, net->active_addresses, net->desc);
- for (cur_address = net->head; NULL != cur_address; cur_address =
cur_address->next)
+ for (aw = net->head; NULL != aw; aw = aw->next)
{
- if (GNUNET_YES == cur_address->addr->active)
+ if (GNUNET_YES == aw->addr->active)
{
peer_relative_prefs = s->env->get_preferences (s->env->cls,
- &cur_address->addr->peer);
+ &aw->addr->peer);
cur_pref = peer_relative_prefs[GNUNET_ATS_PREFERENCE_BANDWIDTH];
total_weight = net->active_addresses +
@@ -595,7 +581,7 @@
LOG (GNUNET_ERROR_TYPE_INFO,
"New quota for peer `%s' with weight (cur/total) %.3f/%.3f (in/out):
%llu / %llu\n",
- GNUNET_i2s (&cur_address->addr->peer), peer_weight, total_weight,
+ GNUNET_i2s (&aw->addr->peer), peer_weight, total_weight,
assigned_quota_in, assigned_quota_out);
}
else
@@ -613,9 +599,8 @@
assigned_quota_out = UINT32_MAX;
/* Compare to current bandwidth assigned */
- asi = cur_address->addr->solver_information;
- asi->calculated_quota_in = assigned_quota_in;
- asi->calculated_quota_out = assigned_quota_out;
+ aw->calculated_quota_in = assigned_quota_in;
+ aw->calculated_quota_out = assigned_quota_out;
}
LOG(GNUNET_ERROR_TYPE_DEBUG,
"Total bandwidth assigned is (in/out): %llu /%llu\n", quota_in_used,
@@ -686,7 +671,7 @@
struct FindBestAddressCtx *ctx = cls;
struct ATS_Address *current = value;
struct ATS_Address *current_best = current;
- struct AddressSolverInformation *asi;
+ struct AddressWrapper *asi;
struct GNUNET_TIME_Relative active_time;
struct GNUNET_TIME_Relative min_active_time;
double best_delay;
@@ -900,43 +885,6 @@
/**
- * Increase address count in network
- *
- * @param s the solver handle
- * @param net the network type
- * @param total increase total addresses
- * @param active increase active addresses
- */
-static void
-address_increment (struct GAS_PROPORTIONAL_Handle *s,
- struct Network *net,
- int total,
- int active)
-{
- if (GNUNET_YES == total)
- {
- s->total_addresses++;
- net->total_addresses++;
- GNUNET_STATISTICS_update (s->env->stats,
- "# ATS addresses total", 1, GNUNET_NO);
- GNUNET_STATISTICS_update (s->env->stats,
- net->stat_total, 1, GNUNET_NO);
- }
- if (GNUNET_YES == active)
- {
- net->active_addresses++;
- s->active_addresses++;
- GNUNET_STATISTICS_update (s->env->stats,
- "# ATS active addresses total", 1,
- GNUNET_NO);
- GNUNET_STATISTICS_update (s->env->stats,
- net->stat_active, 1, GNUNET_NO);
- }
-
-}
-
-
-/**
* Decrease address count in network
*
* @param s the solver handle
@@ -944,32 +892,17 @@
* @param total decrease total addresses
* @param active decrease active addresses
*/
-static int
-addresse_decrement (struct GAS_PROPORTIONAL_Handle *s,
+static void
+address_decrement (struct GAS_PROPORTIONAL_Handle *s,
struct Network *net,
int total,
int active)
{
- int res = GNUNET_OK;
-
if (GNUNET_YES == total)
{
- if (s->total_addresses < 1)
- {
- GNUNET_break(0);
- res = GNUNET_SYSERR;
- }
- else
- {
- s->total_addresses--;
- GNUNET_STATISTICS_update (s->env->stats,
- "# ATS addresses total", -1,
- GNUNET_NO);
- }
if (net->total_addresses < 1)
{
GNUNET_break(0);
- res = GNUNET_SYSERR;
}
else
{
@@ -983,8 +916,7 @@
{
if (net->active_addresses < 1)
{
- GNUNET_break(0);
- res = GNUNET_SYSERR;
+ GNUNET_break (0);
}
else
{
@@ -994,18 +926,17 @@
}
if (s->active_addresses < 1)
{
- GNUNET_break(0);
- res = GNUNET_SYSERR;
+ GNUNET_break (0);
}
else
{
s->active_addresses--;
GNUNET_STATISTICS_update (s->env->stats,
- "# ATS addresses total", -1,
- GNUNET_NO);
+ "# ATS addresses total",
+ -1,
+ GNUNET_NO);
}
}
- return res;
}
@@ -1044,20 +975,18 @@
struct Network *net)
{
struct AddressWrapper *cur;
- struct AddressSolverInformation *asi;
for (cur = net->head; NULL != cur; cur = cur->next)
{
- asi = cur->addr->solver_information;
- if ( (cur->addr->assigned_bw_in != asi->calculated_quota_in) ||
- (cur->addr->assigned_bw_out != asi->calculated_quota_out) )
+ if ( (cur->addr->assigned_bw_in != cur->calculated_quota_in) ||
+ (cur->addr->assigned_bw_out != cur->calculated_quota_out) )
{
- cur->addr->assigned_bw_in = asi->calculated_quota_in;
- cur->addr->assigned_bw_out = asi->calculated_quota_out;
+ cur->addr->assigned_bw_in = cur->calculated_quota_in;
+ cur->addr->assigned_bw_out = cur->calculated_quota_out;
/* Reset for next iteration */
- asi->calculated_quota_in = 0;
- asi->calculated_quota_out = 0;
+ cur->calculated_quota_in = 0;
+ cur->calculated_quota_out = 0;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Bandwidth for %s address %p for peer `%s' changed to %u/%u\n",
(GNUNET_NO == cur->addr->active) ? "inactive" : "active",
@@ -1097,8 +1026,9 @@
{
LOG (GNUNET_ERROR_TYPE_INFO,
"Redistributing bandwidth in network %s with %u active and %u total
addresses\n",
- GNUNET_ATS_print_network_type(n->type),
- n->active_addresses, n->total_addresses);
+ GNUNET_ATS_print_network_type(n->type),
+ n->active_addresses,
+ n->total_addresses);
s->env->info_cb (s->env->cls,
GAS_OP_SOLVE_START,
@@ -1174,7 +1104,7 @@
{
struct ATS_Address *best_address;
struct ATS_Address *current_address;
- struct AddressSolverInformation *asi;
+ struct AddressWrapper *asi;
struct Network *net;
LOG (GNUNET_ERROR_TYPE_INFO,
@@ -1224,8 +1154,7 @@
current_address->assigned_bw_in = 0; /* no bandwidth assigned */
current_address->assigned_bw_out = 0; /* no bandwidth assigned */
- if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
- GNUNET_break(0);
+ address_decrement (s, net, GNUNET_NO, GNUNET_YES);
/* Update network of previous address */
distribute_bandwidth_in_network (s, net);
@@ -1269,7 +1198,17 @@
/* Mark address as active */
asi->activated = GNUNET_TIME_absolute_get ();
best_address->active = GNUNET_YES;
- address_increment (s, net, GNUNET_NO, GNUNET_YES);
+
+ net->active_addresses++;
+ s->active_addresses++;
+ GNUNET_STATISTICS_update (s->env->stats,
+ "# ATS active addresses total",
+ 1,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (s->env->stats,
+ net->stat_active,
+ 1,
+ GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_INFO,
"Address %p for peer `%s' is now active\n",
best_address,
@@ -1297,7 +1236,7 @@
struct GAS_PROPORTIONAL_Handle *s = solver;
struct ATS_Address *best_address;
struct ATS_Address *active_address;
- struct AddressSolverInformation *asi;
+ struct AddressWrapper *asi;
if (0 ==
s->env->get_connectivity (s->env->cls,
@@ -1380,7 +1319,7 @@
{
struct GAS_PROPORTIONAL_Handle *s = solver;
struct ATS_Address *cur;
- struct AddressSolverInformation *asi;
+ struct AddressWrapper *asi;
struct Network *cur_net;
cur = get_active_address (s,
@@ -1396,15 +1335,13 @@
/* Disabling current address */
asi = cur->solver_information;
- cur_net = asi->network ;
+ cur_net = asi->network;
asi->activated = GNUNET_TIME_UNIT_ZERO_ABS;
cur->active = GNUNET_NO; /* No active any longer */
cur->assigned_bw_in = 0; /* no bandwidth assigned */
cur->assigned_bw_out = 0; /* no bandwidth assigned */
- if (GNUNET_SYSERR ==
- addresse_decrement (s, cur_net, GNUNET_NO, GNUNET_YES))
- GNUNET_break(0);
+ address_decrement (s, cur_net, GNUNET_NO, GNUNET_YES);
distribute_bandwidth_in_network (s, cur_net);
}
@@ -1412,120 +1349,6 @@
/**
- * Remove an address from the solver
- *
- * @param solver the solver handle
- * @param address the address to remove
- * @param session_only delete only session not whole address
- */
-static void
-GAS_proportional_address_delete (void *solver,
- struct ATS_Address *address,
- int session_only)
-{
- struct GAS_PROPORTIONAL_Handle *s = solver;
- struct Network *net;
- struct AddressWrapper *aw;
- struct AddressSolverInformation *asi;
-
- /* Remove an adress completely, we have to:
- * - Remove from specific network
- * - Decrease number of total addresses
- * - If active:
- * - decrease number of active addreses
- * - update quotas
- */
- asi = address->solver_information;
-
- if (NULL == asi)
- {
- GNUNET_break (0);
- return;
- }
- net = asi->network;
-
- if (GNUNET_NO == session_only)
- {
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Deleting %s address %p for peer `%s' from network `%s' (total: %u/
active: %u)\n",
- (GNUNET_NO == address->active) ? "inactive" : "active",
- address,
- GNUNET_i2s (&address->peer),
- net->desc,
- net->total_addresses,
- net->active_addresses);
-
- /* Remove address */
- addresse_decrement (s, net, GNUNET_YES, GNUNET_NO);
- for (aw = net->head; NULL != aw; aw = aw->next)
- {
- if (aw->addr == address)
- break;
- }
- if (NULL == aw)
- {
- GNUNET_break(0);
- return;
- }
- GNUNET_CONTAINER_DLL_remove (net->head,
- net->tail,
- aw);
- GNUNET_free (aw);
- }
- else
- {
- /* Remove session only: remove if active and update */
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Deleting %s session %p for peer `%s' from network `%s' (total: %u/
active: %u)\n",
- (GNUNET_NO == address->active) ? "inactive" : "active",
- address,
- GNUNET_i2s (&address->peer),
- net->desc,
- net->total_addresses,
- net->active_addresses);
- }
-
- if (GNUNET_YES == address->active)
- {
- /* Address was active, remove from network and update quotas*/
- address->active = GNUNET_NO;
- address->assigned_bw_in = 0;
- address->assigned_bw_out = 0;
- asi->calculated_quota_in = 0;
- asi->calculated_quota_out = 0;
-
- if (GNUNET_SYSERR ==
- addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
- GNUNET_break(0);
- distribute_bandwidth_in_network (s, net);
-
- if (NULL ==
- update_active_address (s, &address->peer))
- {
- /* No alternative address found, disconnect peer */
- LOG (GNUNET_ERROR_TYPE_INFO,
- "Disconnecting peer `%s' after deleting previous address %p\n",
- GNUNET_i2s (&address->peer),
- address);
- s->env->bandwidth_changed_cb (s->env->cls,
- address);
- }
- }
- if (GNUNET_NO == session_only)
- {
- GNUNET_free_non_null (address->solver_information);
- address->solver_information = NULL;
- }
-
- LOG (GNUNET_ERROR_TYPE_INFO,
- "After deleting address now total %u and active %u addresses in network
`%s'\n",
- net->total_addresses,
- net->active_addresses,
- net->desc);
-}
-
-
-/**
* Start a bulk operation
*
* @param solver the solver
@@ -1560,7 +1383,8 @@
s->bulk_lock--;
if ((0 == s->bulk_lock) && (0 < s->bulk_requests))
{
- LOG(GNUNET_ERROR_TYPE_INFO, "No lock pending, recalculating\n");
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "No lock pending, recalculating\n");
distribute_bandwidth_in_network (s, NULL);
s->bulk_requests = 0;
}
@@ -1568,19 +1392,6 @@
/**
- * Add a new single address to a network
- *
- * @param solver the solver Handle
- * @param address the address to add
- * @param network network type of this address
- */
-static void
-GAS_proportional_address_add (void *solver,
- struct ATS_Address *address,
- uint32_t network);
-
-
-/**
* Transport properties for this address have changed
*
* @param solver solver handle
@@ -1598,7 +1409,7 @@
{
struct GAS_PROPORTIONAL_Handle *s = solver;
struct Network *n;
- struct AddressSolverInformation *asi;
+ struct AddressWrapper *asi;
struct ATS_Address *best_address;
struct ATS_Address *active_address;
@@ -1662,32 +1473,32 @@
struct GAS_PROPORTIONAL_Handle *s = solver;
struct Network *net;
struct AddressWrapper *aw;
- struct AddressSolverInformation *asi;
- net = get_network (s, network);
+ net = get_network (s,
+ network);
if (NULL == net)
{
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Unknown network %u `%s' for new address %p for peer `%s'\n",
- network,
- GNUNET_ATS_print_network_type (network),
- address,
- GNUNET_i2s (&address->peer));
return;
}
aw = GNUNET_new (struct AddressWrapper);
aw->addr = address;
- GNUNET_CONTAINER_DLL_insert (net->head, net->tail, aw);
- address_increment (s, net, GNUNET_YES, GNUNET_NO);
+ GNUNET_CONTAINER_DLL_insert (net->head,
+ net->tail,
+ aw);
+ net->total_addresses++;
+ GNUNET_STATISTICS_update (s->env->stats,
+ "# ATS addresses total",
+ 1,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (s->env->stats,
+ net->stat_total,
+ 1,
+ GNUNET_NO);
+ aw->network = net;
+ address->solver_information = aw;
- asi = GNUNET_new (struct AddressSolverInformation);
- asi->network = net;
- asi->calculated_quota_in = 0;
- asi->calculated_quota_out = 0;
- aw->addr->solver_information = asi;
-
LOG (GNUNET_ERROR_TYPE_INFO,
"Adding new address %p for peer `%s', now total %u and active %u
addresses in network `%s'\n",
address,
@@ -1708,6 +1519,73 @@
/**
+ * Remove an address from the solver. To do so, we:
+ * - Removed it from specific network
+ * - Decrease the number of total addresses
+ * - If active:
+ * - decrease number of active addreses
+ * - update quotas
+ *
+ * @param solver the solver handle
+ * @param address the address to remove
+ */
+static void
+GAS_proportional_address_delete (void *solver,
+ struct ATS_Address *address)
+{
+ struct GAS_PROPORTIONAL_Handle *s = solver;
+ struct AddressWrapper *aw = address->solver_information;
+ struct Network *net = aw->network;
+
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Deleting %s address for peer `%s' from network `%s' (total: %u/active:
%u)\n",
+ (GNUNET_NO == address->active) ? "inactive" : "active",
+ GNUNET_i2s (&address->peer),
+ net->desc,
+ net->total_addresses,
+ net->active_addresses);
+
+ /* Remove address */
+ address_decrement (s, net, GNUNET_YES, GNUNET_NO);
+ if (GNUNET_YES == address->active)
+ {
+ /* Address was active, remove from network and update quotas*/
+ address->active = GNUNET_NO;
+ address->assigned_bw_in = 0;
+ address->assigned_bw_out = 0;
+ aw->calculated_quota_in = 0;
+ aw->calculated_quota_out = 0;
+
+ address_decrement (s, net, GNUNET_NO, GNUNET_YES);
+ distribute_bandwidth_in_network (s, net);
+
+ if (NULL ==
+ update_active_address (s, &address->peer))
+ {
+ /* No alternative address found, disconnect peer */
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Disconnecting peer `%s' after deleting previous address %p\n",
+ GNUNET_i2s (&address->peer),
+ address);
+ s->env->bandwidth_changed_cb (s->env->cls,
+ address);
+ }
+ }
+ GNUNET_CONTAINER_DLL_remove (net->head,
+ net->tail,
+ aw);
+ GNUNET_free (aw);
+ address->solver_information = NULL;
+
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "After deleting address now total %u and active %u addresses in network
`%s'\n",
+ net->total_addresses,
+ net->active_addresses,
+ net->desc);
+}
+
+
+/**
* Function invoked when the plugin is loaded.
*
* @param[in,out] cls the `struct GNUNET_ATS_PluginEnvironment *` to use;
Modified: gnunet/src/ats/plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/plugin_ats_ril.c 2015-02-08 15:50:13 UTC (rev 35161)
+++ gnunet/src/ats/plugin_ats_ril.c 2015-02-08 16:24:42 UTC (rev 35162)
@@ -2257,12 +2257,10 @@
*
* @param solver the solver handle
* @param address the address to remove
- * @param session_only delete only session not whole address
*/
static void
GAS_ril_address_delete (void *solver,
- struct ATS_Address *address,
- int session_only)
+ struct ATS_Address *address)
{
struct GAS_RIL_Handle *s = solver;
struct RIL_Peer_Agent *agent;
@@ -2274,8 +2272,9 @@
struct RIL_Scope *net;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "API_address_delete() Delete %s%s %s address %s for peer '%s'\n",
- session_only ? "session for " : "", address->active ? "active" :
"inactive", address->plugin,
+ "API_address_delete() Delete %s %s address %s for peer '%s'\n",
+ address->active ? "active" : "inactive",
+ address->plugin,
address->addr,
GNUNET_i2s (&address->peer));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35162 - gnunet/src/ats,
gnunet <=