/*
This file is part of GNUnet.
- (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
struct ATS_Address *address_naked;
};
+
struct RIL_Peer_Agent
{
/**
/**
* Last perceived state feature vector
*/
- double * s_old;
+ double *s_old;
/**
* Last chosen action
/**
* Address in use
*/
- struct ATS_Address * address_inuse;
+ struct ATS_Address *address_inuse;
/**
* Head of addresses DLL
*/
- struct RIL_Address_Wrapped * addresses_head;
+ struct RIL_Address_Wrapped *addresses_head;
/**
* Tail of addresses DLL
*/
- struct RIL_Address_Wrapped * addresses_tail;
+ struct RIL_Address_Wrapped *addresses_tail;
/**
* Inbound bandwidth assigned by the agent
*/
- unsigned long long bw_in;
+ uint32_t bw_in;
/**
* Outbound bandwidth assigned by the agent
*/
- unsigned long long bw_out;
+ uint32_t bw_out;
/**
* Flag whether a suggestion has to be issued
/**
* The address which has to be issued
*/
- struct ATS_Address * suggestion_address;
+ struct ATS_Address *suggestion_address;
/**
* The agent's last objective value
/**
* Total available inbound bandwidth
*/
- unsigned long long bw_in_available;
+ uint32_t bw_in_available;
/**
* Bandwidth inbound assigned in network after last step
*/
- unsigned long long bw_in_assigned;
+ uint32_t bw_in_assigned;
/**
* Bandwidth inbound actually utilized in the network
*/
- unsigned long long bw_in_utilized;
+ uint32_t bw_in_utilized;
/**
* Total available outbound bandwidth
*/
- unsigned long long bw_out_available;
+ uint32_t bw_out_available;
/**
* Bandwidth outbound assigned in network after last step
/**
* The solver-plugin environment of the solver-plugin API
*/
- struct GNUNET_ATS_PluginEnvironment *plugin_envi;
-
- /**
- * Statistics handle
- */
- struct GNUNET_STATISTICS_Handle *stats;
+ struct GNUNET_ATS_PluginEnvironment *env;
/**
* Number of performed steps
/**
* Task identifier of the next time-step to be executed
*/
- GNUNET_SCHEDULER_TaskIdentifier step_next_task_id;
+ struct GNUNET_SCHEDULER_Task * step_next_task_id;
/**
* Variable discount factor, dependent on time between steps
* @return estimation value
*/
static double
-agent_q (struct RIL_Peer_Agent *agent, double *state, int action)
+agent_q (struct RIL_Peer_Agent *agent,
+ const double *state,
+ int action)
{
- int i;
- double result = 0;
+ unsigned int i;
+ double result = 0.0;
for (i = 0; i < agent->m; i++)
- {
result += state[i] * agent->W[action][i];
- }
- GNUNET_assert(!isnan(result));
-
- //prevent crash when learning diverges
+ /* prevent crashes if learning diverges */
+ if (isnan(result))
+ return isnan(result) * UINT32_MAX;
if (isinf(result))
- {
return isinf(result) * UINT32_MAX;
- }
return result;
}
enum GAS_Solver_Operation op,
enum GAS_Solver_Status stat)
{
- if (NULL != solver->plugin_envi->info_cb)
- solver->plugin_envi->info_cb (solver->plugin_envi->info_cb_cls, op, stat, GAS_INFO_NONE);
+ solver->env->info_cb (solver->env->cls,
+ op,
+ stat,
+ GAS_INFO_NONE);
}
/**
* @param new_address the address which is to be used
* @param new_bw_in the new amount of inbound bandwidth set for this address
* @param new_bw_out the new amount of outbound bandwidth set for this address
- * @param silent disables invocation of the bw_changed callback, if GNUNET_YES
+ * @param silent disables invocation of the bw_changed callback, if #GNUNET_YES
*/
static void
envi_set_active_suggestion (struct GAS_RIL_Handle *solver,
{
int notify = GNUNET_NO;
- LOG(GNUNET_ERROR_TYPE_DEBUG, " set_active_suggestion() for peer '%s'\n", GNUNET_i2s (&agent->peer));
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ " set_active_suggestion() for peer '%s'\n",
+ GNUNET_i2s (&agent->peer));
//address change
if (agent->address_inuse != new_address)
if (NULL != agent->address_inuse)
{
agent->address_inuse->active = GNUNET_NO;
- agent->address_inuse->assigned_bw_in.value__ = htonl (0);
- agent->address_inuse->assigned_bw_out.value__ = htonl (0);
+ agent->address_inuse->assigned_bw_in = 0;
+ agent->address_inuse->assigned_bw_out = 0;
}
if (NULL != new_address)
{
LOG(GNUNET_ERROR_TYPE_DEBUG, " set address active: %s\n", agent->is_active ? "yes" : "no");
new_address->active = agent->is_active;
- new_address->assigned_bw_in.value__ = htonl (agent->bw_in);
- new_address->assigned_bw_out.value__ = htonl (agent->bw_out);
+ new_address->assigned_bw_in = agent->bw_in;
+ new_address->assigned_bw_out = agent->bw_out;
}
notify |= GNUNET_YES;
}
if (agent->bw_in != new_bw_in)
{
agent->bw_in = new_bw_in;
- new_address->assigned_bw_in.value__ = htonl (new_bw_in);
+ new_address->assigned_bw_in = new_bw_in;
notify |= GNUNET_YES;
}
if (agent->bw_out != new_bw_out)
{
agent->bw_out = new_bw_out;
- new_address->assigned_bw_out.value__ = htonl (new_bw_out);
+ new_address->assigned_bw_out = new_bw_out;
notify |= GNUNET_YES;
}
}
}
else if (agent->address_inuse)
{
- //disconnect case, no new address
- GNUNET_assert(0 == ntohl (agent->address_inuse->assigned_bw_in.value__));
- GNUNET_assert(0 == ntohl (agent->address_inuse->assigned_bw_out.value__));
+ /* disconnect case, no new address */
+ GNUNET_assert(0 == agent->address_inuse->assigned_bw_in);
+ GNUNET_assert(0 == agent->address_inuse->assigned_bw_out);
agent->bw_in = 0;
agent->bw_out = 0;
return state;
}
-/**
- * Retrieves an ATS information value of an address
- *
- * @param address the address in question
- * @param type the ATS information type
- * @return the value
- */
-static unsigned int
-ril_get_atsi (struct ATS_Address *address, uint32_t type)
-{
- int c1;
- GNUNET_assert(NULL != address);
-
- if ((NULL == address->atsi) || (0 == address->atsi_count))
- return GNUNET_ATS_QUALITY_NET_DELAY == type ? UINT32_MAX : 1;
-
- for (c1 = 0; c1 < address->atsi_count; c1++)
- {
- if (ntohl (address->atsi[c1].type) == type)
- return ntohl (address->atsi[c1].value);
- }
- return GNUNET_ATS_QUALITY_NET_DELAY == type ? UINT32_MAX : 1;
-}
/**
* Returns the utility value of the connection an agent manages
double delay_norm;
double pref_match;
- preferences = agent->envi->plugin_envi->get_preferences (agent->envi->plugin_envi->get_preference_cls,
- &agent->peer);
+ preferences = agent->envi->env->get_preferences (agent->envi->env->cls,
+ &agent->peer);
- delay_atsi = (double) ril_get_atsi (agent->address_inuse, GNUNET_ATS_QUALITY_NET_DELAY);
+ delay_atsi = agent->address_inuse->norm_delay.norm;
delay_norm = RIL_UTILITY_DELAY_MAX*exp(-delay_atsi*0.00001);
pref_match = preferences[GNUNET_ATS_PREFERENCE_LATENCY] * delay_norm;
pref_match += preferences[GNUNET_ATS_PREFERENCE_BANDWIDTH] *
sqrt((double) (agent->bw_in/RIL_MIN_BW) * (double) (agent->bw_out/RIL_MIN_BW));
-// sqrt((double) (ril_get_atsi (agent->address_inuse, GNUNET_ATS_UTILIZATION_IN)/RIL_MIN_BW) * (double) (ril_get_atsi (agent->address_inuse, GNUNET_ATS_UTILIZATION_OUT)/RIL_MIN_BW));
-
-// return (double) (agent->bw_in/RIL_MIN_BW);
-// return sqrt((double) (agent->bw_in/RIL_MIN_BW) * (double) (agent->bw_out/RIL_MIN_BW));
return pref_match;
}
if (agent_action_is_possible(agent, i))
{
eqt[i] = exp(agent_q(agent,state,i) / agent->envi->parameters.temperature);
+ if (isinf (eqt[i]))
+ eqt[i] = isinf(eqt[i]) * UINT32_MAX;
sum += eqt[i];
}
}
static void
ril_step (struct GAS_RIL_Handle *solver);
+
/**
* Task for the scheduler, which performs one step and lets the solver know that
* no further step is scheduled.
*
* @param cls the solver handle
- * @param tc the task context for the scheduler
*/
static void
-ril_step_scheduler_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ril_step_scheduler_task (void *cls)
{
struct GAS_RIL_Handle *solver = cls;
- solver->step_next_task_id = GNUNET_SCHEDULER_NO_TASK;
+ solver->step_next_task_id = NULL;
ril_step (solver);
}
if (net->type == type)
{
if (direction_in)
- sum += ril_get_atsi (cur->address_inuse, GNUNET_ATS_UTILIZATION_IN);
+ sum += cur->address_inuse->norm_utilization_in.norm;
else
- sum += ril_get_atsi (cur->address_inuse, GNUNET_ATS_UTILIZATION_OUT);
+ sum += cur->address_inuse->norm_utilization_out.norm;
}
}
}
time_next = GNUNET_TIME_UNIT_ZERO;
}
- if ((GNUNET_SCHEDULER_NO_TASK == solver->step_next_task_id) && (GNUNET_NO == solver->done))
+ if ((NULL == solver->step_next_task_id) && (GNUNET_NO == solver->done))
{
solver->step_next_task_id = GNUNET_SCHEDULER_add_delayed (time_next, &ril_step_scheduler_task,
solver);
ril_networks_update_state (solver);
- solver->step_count += 1;
+ solver->step_count++;
ril_step_schedule_next (solver);
ril_inform (solver, GAS_OP_SOLVE_STOP, GAS_STAT_SUCCESS);
for (cur = solver->agents_head; NULL != cur; cur = cur->next)
{
if (cur->suggestion_issue) {
- solver->plugin_envi->bandwidth_changed_cb(solver->plugin_envi->bw_changed_cb_cls, cur->suggestion_address);
+ solver->env->bandwidth_changed_cb (solver->env->cls,
+ cur->suggestion_address);
cur->suggestion_issue = GNUNET_NO;
}
}
else
{
tmpptr = GNUNET_malloc (size);
- memcpy (tmpptr, oldptr, bytes_before);
- memcpy (tmpptr + bytes_before, oldptr + (bytes_before + bytes_hole), bytes_after);
+ GNUNET_memcpy (tmpptr, oldptr, bytes_before);
+ GNUNET_memcpy (tmpptr + bytes_before, oldptr + (bytes_before + bytes_hole), bytes_after);
}
if (NULL != *old)
{
* @param network network type of this address
*/
static void
-GAS_ril_address_add (void *solver,
+GAS_ril_address_add (void *solver,
struct ATS_Address *address,
uint32_t network)
{
int i;
unsigned int zero;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"API_address_add()\n");
net = ril_get_network (s, network);
*
* @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;
struct RIL_Address_Wrapped *address_wrapped;
- int address_was_used = address->active;
int address_index;
unsigned int m_new;
unsigned int n_new;
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,
- address->addr,
+ "API_address_delete() Delete %s %s address %s for peer '%s'\n",
+ address->active ? "active" : "inactive",
+ address->plugin,
+ address->addr,
GNUNET_i2s (&address->peer));
agent = ril_get_agent (s, &address->peer, GNUNET_NO);
if (NULL == agent)
{
net = address->solver_information;
- GNUNET_assert(!ril_network_is_active (s, net->type));
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "No agent allocated for peer yet, since address was in inactive network\n");
+ GNUNET_assert(! ril_network_is_active (s, net->type));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "No agent allocated for peer yet, since address was in inactive network\n");
return;
}
if (NULL == address_wrapped)
{
net = address->solver_information;
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Address not considered by agent, address was in inactive network\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Address not considered by agent, address was in inactive network\n");
return;
}
-
- GNUNET_CONTAINER_DLL_remove(agent->addresses_head, agent->addresses_tail, address_wrapped);
- GNUNET_free(address_wrapped);
+ GNUNET_CONTAINER_DLL_remove (agent->addresses_head,
+ agent->addresses_tail,
+ address_wrapped);
+ GNUNET_free (address_wrapped);
//decrease W
m_new = agent->m - ((s->parameters.rbf_divisor+1) * (s->parameters.rbf_divisor+1));
}
//decrease old state vector
ril_cut_from_vector ((void **) &agent->s_old, sizeof(double),
- address_index * ((s->parameters.rbf_divisor+1) * (s->parameters.rbf_divisor+1)),
- ((s->parameters.rbf_divisor+1) * (s->parameters.rbf_divisor+1)), agent->m);
+ address_index * ((s->parameters.rbf_divisor+1) * (s->parameters.rbf_divisor+1)),
+ ((s->parameters.rbf_divisor+1) * (s->parameters.rbf_divisor+1)), agent->m);
agent->m = m_new;
agent->n = n_new;
- if (address_was_used)
+ if (agent->address_inuse == address)
{
if (NULL != agent->addresses_head) //if peer has an address left, use it
{
- envi_set_active_suggestion (s, agent, agent->addresses_head->address_naked, agent->bw_in, agent->bw_out,
- GNUNET_YES);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Active address died, suggesting alternative!\n");
+ envi_set_active_suggestion (s,
+ agent,
+ agent->addresses_head->address_naked,
+ agent->bw_in,
+ agent->bw_out,
+ GNUNET_YES);
}
else
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Active address died, suggesting disconnect!\n");
envi_set_active_suggestion (s, agent, NULL, 0, 0, GNUNET_NO);
}
}
-
ril_step (solver);
+ if (agent->suggestion_address == address)
+ {
+ agent->suggestion_issue = GNUNET_NO;
+ agent->suggestion_address = NULL;
+ }
+ GNUNET_assert (agent->address_inuse != address);
}
+
/**
* Update the properties of an address in the solver
*
* @param solver solver handle
* @param address the address
- * @param type the ATSI type in HBO
- * @param abs_value the absolute value of the property
- * @param rel_value the normalized value
*/
static void
GAS_ril_address_property_changed (void *solver,
- struct ATS_Address *address,
- uint32_t type,
- uint32_t abs_value,
- double rel_value)
+ struct ATS_Address *address)
{
struct GAS_RIL_Handle *s = solver;
LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_address_property_changed() Property '%s' for peer '%s' address %s changed "
- "to %.2f \n",
- GNUNET_ATS_print_property_type (type),
- GNUNET_i2s (&address->peer),
- address->addr, rel_value);
-
-
+ "Properties for peer '%s' address changed\n",
+ GNUNET_i2s (&address->peer));
s->parameters.temperature = s->parameters.temperature_init;
s->parameters.epsilon = s->parameters.epsilon_init;
ril_step (s);
}
-/**
- * Update the session of an address in the solver
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param cur_session the current session
- * @param new_session the new session
- */
-static void
-GAS_ril_address_session_changed (void *solver,
- struct ATS_Address *address,
- uint32_t cur_session,
- uint32_t new_session)
-{
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_address_session_changed()\n");
-}
-
-
-/**
- * Notify the solver that an address is (not) actively used by transport
- * to communicate with a remote peer
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param in_use usage state
- */
-static void
-GAS_ril_address_inuse_changed (void *solver,
- struct ATS_Address *address,
- int in_use)
-{
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_address_inuse_changed() Usage for %s address of peer '%s' changed to %s\n",
- address->plugin, GNUNET_i2s (&address->peer), (GNUNET_YES == in_use) ? "USED" : "UNUSED");
-}
-
-
-/**
- * Notify solver that the network an address is located in has changed
- *
- * NOTE: values in addresses are already updated
- *
- * @param solver solver handle
- * @param address the address
- * @param current_network the current network
- * @param new_network the new network
- */
-static void
-GAS_ril_address_change_network (void *solver,
- struct ATS_Address *address,
- uint32_t current_network,
- uint32_t new_network)
-{
- struct GAS_RIL_Handle *s = solver;
- struct RIL_Peer_Agent *agent;
-
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_address_change_network() Network type changed, moving "
- "%s address of peer %s from '%s' to '%s'\n",
- (GNUNET_YES == address->active) ? "active" : "inactive", GNUNET_i2s (&address->peer),
- GNUNET_ATS_print_network_type (current_network), GNUNET_ATS_print_network_type (new_network));
-
- s->parameters.temperature = s->parameters.temperature_init;
- s->parameters.epsilon = s->parameters.epsilon_init;
-
- if (address->active && !ril_network_is_active (solver, new_network))
- {
- GAS_ril_address_delete (solver, address, GNUNET_NO);
- return;
- }
-
- agent = ril_get_agent (s, &address->peer, GNUNET_NO);
- if (NULL == agent)
- {
- GNUNET_assert(!ril_network_is_active (solver, current_network));
-
- GAS_ril_address_add (s, address, new_network);
- return;
- }
-
- address->solver_information = ril_get_network(solver, new_network);
-}
-
-
/**
* Give feedback about the current assignment
*
*/
static void
GAS_ril_address_preference_feedback (void *solver,
- void *application,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TIME_Relative scope,
- enum GNUNET_ATS_PreferenceKind kind,
- double score)
+ struct GNUNET_SERVER_Client *application,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TIME_Relative scope,
+ enum GNUNET_ATS_PreferenceKind kind,
+ double score)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_address_preference_feedback() Peer '%s' got a feedback of %+.3f from application %s for "
- "preference %s for %d seconds\n", GNUNET_i2s (peer), "UNKNOWN",
- GNUNET_ATS_print_preference_type (kind), scope.rel_value_us / 1000000);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "API_address_preference_feedback() Peer '%s' got a feedback of %+.3f from application %s for "
+ "preference %s for %d seconds\n",
+ GNUNET_i2s (peer),
+ "UNKNOWN",
+ GNUNET_ATS_print_preference_type (kind),
+ scope.rel_value_us / 1000000);
}
{
struct GAS_RIL_Handle *s = solver;
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_bulk_stop() lock: %d\n",
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ "API_bulk_stop() lock: %d\n",
s->bulk_lock - 1);
if (s->bulk_lock < 1)
* @param solver the solver handle
* @param peer the identity of the peer
*/
-static const struct ATS_Address *
+static void
GAS_ril_get_preferred_address (void *solver,
const struct GNUNET_PeerIdentity *peer)
{
s->parameters.temperature = s->parameters.temperature_init;
s->parameters.epsilon = s->parameters.epsilon_init;
}
- return agent->address_inuse;
+ if (NULL != agent->address_inuse)
+ s->env->bandwidth_changed_cb (s->env->cls,
+ agent->address_inuse);
}
+
/**
* Tell solver stop notifying ATS about changes for this peers
*
struct GAS_RIL_Handle *s = solver;
struct RIL_Peer_Agent *agent;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"API_stop_get_preferred_address()");
agent = ril_get_agent (s, peer, GNUNET_NO);
ril_step (s);
LOG(GNUNET_ERROR_TYPE_DEBUG,
- "API_stop_get_preferred_address() Paused agent for peer '%s' with %s address\n",
- GNUNET_i2s (peer), agent->address_inuse->plugin);
+ "API_stop_get_preferred_address() Paused agent for peer '%s'\n",
+ GNUNET_i2s (peer));
}
void *
libgnunet_plugin_ats_ril_init (void *cls)
{
+ static struct GNUNET_ATS_SolverFunctions sf;
struct GNUNET_ATS_PluginEnvironment *env = cls;
struct GAS_RIL_Handle *solver = GNUNET_new (struct GAS_RIL_Handle);
struct RIL_Scope * cur;
char *string;
float f_tmp;
- LOG(GNUNET_ERROR_TYPE_DEBUG, "API_init() Initializing RIL solver\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "API_init() Initializing RIL solver\n");
- GNUNET_assert(NULL != env);
- GNUNET_assert(NULL != env->cfg);
- GNUNET_assert(NULL != env->stats);
- GNUNET_assert(NULL != env->bandwidth_changed_cb);
- GNUNET_assert(NULL != env->get_preferences);
- GNUNET_assert(NULL != env->get_property);
+ GNUNET_assert (NULL != env);
+ GNUNET_assert (NULL != env->cfg);
+ GNUNET_assert (NULL != env->stats);
+ GNUNET_assert (NULL != env->bandwidth_changed_cb);
+ GNUNET_assert (NULL != env->get_preferences);
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number(env->cfg, "ats", "RIL_RBF_DIVISOR", &solver->parameters.rbf_divisor))
{
if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg, "ats", "RIL_ALGORITHM", &string))
{
- solver->parameters.algorithm = !strcmp (string, "SARSA") ? RIL_ALGO_SARSA : RIL_ALGO_Q;
+ GNUNET_STRINGS_utf8_toupper (string, string);
+ if (0 == strcmp (string, "SARSA"))
+ {
+ solver->parameters.algorithm = RIL_ALGO_SARSA;
+ }
+ if (0 == strcmp (string, "Q-LEARNING"))
+ {
+ solver->parameters.algorithm = RIL_ALGO_Q;
+ }
+
GNUNET_free (string);
}
else
if (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_float (env->cfg, "ats",
"RIL_EXPLORE_DECAY", &f_tmp))
{
- if ((f_tmp < 0.0) || (f_tmp > 0.0))
+ if ((f_tmp < 0.0) || (f_tmp > 1.0))
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid %s configuration %f \n"),
"RIL_EXPLORE_DECAY", f_tmp);
solver->parameters.social_welfare = RIL_DEFAULT_WELFARE;
}
- env->sf.s_add = &GAS_ril_address_add;
- env->sf.s_address_update_property = &GAS_ril_address_property_changed;
- env->sf.s_address_update_session = &GAS_ril_address_session_changed;
- env->sf.s_address_update_inuse = &GAS_ril_address_inuse_changed;
- env->sf.s_address_update_network = &GAS_ril_address_change_network;
- env->sf.s_get = &GAS_ril_get_preferred_address;
- env->sf.s_get_stop = &GAS_ril_stop_get_preferred_address;
- env->sf.s_pref = &GAS_ril_address_change_preference;
- env->sf.s_feedback = &GAS_ril_address_preference_feedback;
- env->sf.s_del = &GAS_ril_address_delete;
- env->sf.s_bulk_start = &GAS_ril_bulk_start;
- env->sf.s_bulk_stop = &GAS_ril_bulk_stop;
-
- solver->plugin_envi = env;
+ solver->env = env;
+ sf.cls = solver;
+ sf.s_add = &GAS_ril_address_add;
+ sf.s_address_update_property = &GAS_ril_address_property_changed;
+ sf.s_get = &GAS_ril_get_preferred_address;
+ sf.s_get_stop = &GAS_ril_stop_get_preferred_address;
+ sf.s_pref = &GAS_ril_address_change_preference;
+ sf.s_feedback = &GAS_ril_address_preference_feedback;
+ sf.s_del = &GAS_ril_address_delete;
+ sf.s_bulk_start = &GAS_ril_bulk_start;
+ sf.s_bulk_stop = &GAS_ril_bulk_stop;
+
solver->networks_count = env->network_count;
solver->network_entries = GNUNET_malloc (env->network_count * sizeof (struct RIL_Scope));
solver->step_count = 0;
for (c = 0; c < env->network_count; c++)
{
cur = &solver->network_entries[c];
- cur->type = env->networks[c];
+ cur->type = c;
cur->bw_in_available = env->in_quota[c];
cur->bw_out_available = env->out_quota[c];
- LOG(GNUNET_ERROR_TYPE_DEBUG, "init() Quotas for %s network: IN %llu - OUT %llu\n", GNUNET_ATS_print_network_type(cur->type), cur->bw_in_available/1024, cur->bw_out_available/1024);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "init() Quotas for %s network: IN %llu - OUT %llu\n",
+ GNUNET_ATS_print_network_type(cur->type),
+ cur->bw_in_available/1024,
+ cur->bw_out_available/1024);
}
LOG(GNUNET_ERROR_TYPE_DEBUG, "init() Parameters:\n");
LOG(GNUNET_ERROR_TYPE_DEBUG, "init() RBF_DIVISOR = %llu\n",
solver->parameters.rbf_divisor);
- return solver;
+ return &sf;
}
void *
libgnunet_plugin_ats_ril_done (void *cls)
{
- struct GAS_RIL_Handle *s = cls;
+ struct GNUNET_ATS_SolverFunctions *sf = cls;
+ struct GAS_RIL_Handle *s = sf->cls;
struct RIL_Peer_Agent *cur_agent;
struct RIL_Peer_Agent *next_agent;
cur_agent = next_agent;
}
- if (GNUNET_SCHEDULER_NO_TASK != s->step_next_task_id)
+ if (NULL != s->step_next_task_id)
{
GNUNET_SCHEDULER_cancel (s->step_next_task_id);
}
projects / oweals / gnunet.git / blobdiff