/*
This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- 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.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file ats-tests/ats-testing-experiment.c
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-ats-solver-eval.h"
+#include "gnunet-service-ats_normalization.h"
+#include "gnunet-service-ats_preferences.c"
#define BIG_M_STRING "unlimited"
+/**
+ * Handle for statistics.
+ */
+struct GNUNET_STATISTICS_Handle *GSA_stats;
+
+
static struct Experiment *e;
static struct LoggingHandle *l;
static struct SolverHandle *sh;
static struct TestPeer *peer_head;
+
static struct TestPeer *peer_tail;
static double default_properties[GNUNET_ATS_PropertyCount];
}
}
-struct AddressLookupCtx
-{
- struct ATS_Address *res;
- char *plugin;
- char *addr;
-};
-
-
-int find_address_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- struct AddressLookupCtx *ctx = cls;
- struct ATS_Address *addr = value;
-
- if ( (0 == strcmp (ctx->plugin, addr->plugin)) &&
- (0 == strcmp (ctx->addr, addr->addr)) )
- {
- ctx->res = addr;
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
static struct TestPeer *
find_peer_by_id (int id)
}
-static struct TestAddress *
-find_address_by_ats_address (struct TestPeer *p, const struct ATS_Address *addr)
-{
- struct TestAddress *cur;
- for (cur = p->addr_head; NULL != cur; cur = cur->next)
- if ((0 == strcmp(cur->ats_addr->plugin, addr->plugin)) &&
- (cur->ats_addr->addr_len == addr->addr_len) &&
- (0 == memcmp (cur->ats_addr->addr, addr->addr, addr->addr_len)))
- return cur;
- return NULL;
-}
-
-
/**
* Logging
*/
-
void
GNUNET_ATS_solver_logging_now (struct LoggingHandle *l)
{
/* Store logging data here */
for (cur = peer_head; NULL != cur; cur = cur->next)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Logging peer id %llu\n", cur->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Logging peer id %llu\n", cur->id);
log_p = GNUNET_new (struct LoggingPeer);
log_p->id = cur->id;
log_p->peer_id = cur->peer_id;
+ log_p->is_requested = cur->is_requested;
for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
{
log_p->pref_abs[c] = cur->pref_abs[c];
log_p->pref_norm[c] = cur->pref_norm[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t %s = %.2f %.2f [abs/rel]\n",
- GNUNET_ATS_print_preference_type(c),
- log_p->pref_abs[c], log_p->pref_norm[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "\t %s = %.2f %.2f [abs/rel]\n",
+ GNUNET_ATS_print_preference_type(c),
+ log_p->pref_abs[c], log_p->pref_norm[c]);
}
GNUNET_CONTAINER_DLL_insert_tail(lts->head, lts->tail, log_p);
for (cur_addr = cur->addr_head; NULL != cur_addr; cur_addr = cur_addr->next)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Logging peer id %llu address %llu \n",
- cur->id, cur_addr->aid);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Logging peer id %llu address %llu\n",
+ cur->id, cur_addr->aid);
log_a = GNUNET_new (struct LoggingAddress);
log_a->aid = cur_addr->aid;
log_a->active = cur_addr->ats_addr->active;
log_a->network = cur_addr->network;
- log_a->used = cur_addr->ats_addr->used;
log_a->assigned_bw_in = cur_addr->ats_addr->assigned_bw_in;
log_a->assigned_bw_out = cur_addr->ats_addr->assigned_bw_out;
for (c = 0; c < GNUNET_ATS_PropertyCount; c++)
{
log_a->prop_abs[c] = cur_addr->prop_abs[c];
log_a->prop_norm[c] = cur_addr->prop_norm[c];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t %s = %.2f %.2f [abs/rel]\n",
- GNUNET_ATS_print_property_type(c),
- log_a->prop_abs[c], log_a->prop_norm[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "\t %s = %.2f %.2f [abs/rel]\n",
+ GNUNET_ATS_print_property_type(c),
+ log_a->prop_abs[c],
+ log_a->prop_norm[c]);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", ntohl(log_a->assigned_bw_in.value__));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW out = %llu\n", ntohl(log_a->assigned_bw_out.value__));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", log_a->assigned_bw_in);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\t BW out = %llu\n", log_a->assigned_bw_out);
GNUNET_CONTAINER_DLL_insert_tail (log_p->addr_head, log_p->addr_tail, log_a);
}
}
}
+
static void
-logging_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+logging_task (void *cls)
{
struct LoggingHandle *l = cls;
- l->logging_task = GNUNET_SCHEDULER_NO_TASK;
+ l->logging_task = NULL;
GNUNET_ATS_solver_logging_now (l);
-
- l->logging_task = GNUNET_SCHEDULER_add_delayed (l->log_freq, &logging_task, l);
-
+ l->logging_task = GNUNET_SCHEDULER_add_delayed (l->log_freq,
+ &logging_task,
+ l);
}
struct LoggingHandle *
void
GNUNET_ATS_solver_logging_stop (struct LoggingHandle *l)
{
- if (GNUNET_SCHEDULER_NO_TASK != l->logging_task)
+ if (NULL != l->logging_task)
GNUNET_SCHEDULER_cancel (l->logging_task);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop logging\n");
- l->logging_task = GNUNET_SCHEDULER_NO_TASK;
+ l->logging_task = NULL;
}
static struct LoggingFileHandle *
for (lts = l->head; NULL != lts; lts = lts->next)
{
- fprintf (stderr, "Writing log step %llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Writing log step %llu\n",
(long long unsigned int) lts->timestamp.abs_value_us);
for (log_p = lts->head; NULL != log_p; log_p = log_p->next)
cur->pid = log_p->id;
if (GNUNET_YES == add_time_stamp)
- GNUNET_asprintf (&filename, "%s%s%s_%s_%u_%u_%llu.log",
+ GNUNET_asprintf (&filename, "%s%s%s_%s_p%u_a%u_%llu.log",
(GNUNET_YES == use_dir) ? output_dir : "",
(GNUNET_YES == use_dir) ? DIR_SEPARATOR_STR : "",
e->log_prefix,
opt_solver,
- cur->aid,
cur->pid,
+ cur->aid,
l->head->timestamp.abs_value_us);
else
- GNUNET_asprintf (&filename, "%s%s%s_%s_%u_%u.log",
+ GNUNET_asprintf (&filename, "%s%s%s_%s_p%u_a%u.log",
(GNUNET_YES == use_dir) ? output_dir : "",
(GNUNET_YES == use_dir) ? DIR_SEPARATOR_STR : "",
e->log_prefix,
opt_solver,
- cur->aid,
- cur->pid);
+ cur->pid,
+ cur->aid);
fprintf (stderr, "Add writing log data for peer %llu address %llu to file `%s'\n",
cur->pid, cur->aid, filename);
{
fprintf (stderr, "Cannot open `%s' to write log data!\n", filename);
GNUNET_free (filename);
+ GNUNET_free (cur);
goto cleanup;
}
GNUNET_free (filename);
GNUNET_CONTAINER_DLL_insert (lf_head, lf_tail, cur);
- GNUNET_asprintf(&datastring,"#timestamp_abs; ; addr net; addr_active; bw in; bw out; " \
+ GNUNET_asprintf(&datastring,"#time delta;log duration;peer_requested;addr net; addr_active; bw in; bw out; " \
"UTILIZATION_UP [abs/rel]; UTILIZATION_UP; UTILIZATION_DOWN; UTILIZATION_DOWN; " \
"UTILIZATION_PAYLOAD_UP; UTILIZATION_PAYLOAD_UP; UTILIZATION_PAYLOAD_DOWN; UTILIZATION_PAYLOAD_DOWN;"\
"DELAY; DELAY; " \
"DISTANCE ;DISTANCE ; COST_WAN; COST_WAN; COST_LAN; COST_LAN; " \
- "COST_WLAN; COST_WLAN; PREF BW abs; PREF BW rel; PREF LATENCY abs; PREF LATENCY rel;\n");
+ "COST_WLAN; COST_WLAN;COST_BT; COST_BT; PREF BW abs; PREF BW rel; PREF LATENCY abs; PREF LATENCY rel;\n");
GNUNET_DISK_file_write (cur->f_hd, datastring, strlen(datastring));
GNUNET_free (datastring);
fprintf(stderr, "\t %s = %.2f %.2f [abs/rel]\n",
GNUNET_ATS_print_property_type(c),
log_a->prop_abs[c], log_a->prop_norm[c]);*/
- GNUNET_asprintf(&propstring_tmp,"%s;%.3f;%.3f",
- propstring, log_a->prop_abs[c], log_a->prop_norm[c]);
+ GNUNET_asprintf(&propstring_tmp,"%s%.3f;%.3f;",
+ propstring,
+ log_a->prop_abs[c],
+ log_a->prop_norm[c]);
GNUNET_free (propstring);
propstring = GNUNET_strdup(propstring_tmp);
GNUNET_free (propstring_tmp);
}
-
- GNUNET_asprintf(&datastring,"%llu;%u;%i;%u;%u;%s;%s\n",
- GNUNET_TIME_absolute_get_difference(l->head->timestamp, lts->timestamp).rel_value_us / 1000,
- log_a->network,
- log_a->active,
- ntohl (log_a->assigned_bw_in.value__),
- ntohl (log_a->assigned_bw_out.value__),
- propstring, prefstring);
+ GNUNET_asprintf (&datastring, "%llu;%llu;%u;%u;%i;%u;%u;%s;%s\n",
+ GNUNET_TIME_absolute_get_difference (l->head->timestamp,
+ lts->timestamp).rel_value_us / 1000, lts->delta,
+ log_p->is_requested, log_a->network, log_a->active,
+ log_a->assigned_bw_in, log_a->assigned_bw_out, propstring,
+ prefstring);
GNUNET_DISK_file_write (cur->f_hd, datastring, strlen(datastring));
GNUNET_free (datastring);
{
fprintf (stderr, "\tPeer pid %llu address %llu: %u %u %u\n",
log_p->id, log_a->aid, log_a->active,
- ntohl(log_a->assigned_bw_in.value__),
- ntohl(log_a->assigned_bw_out.value__));
+ log_a->assigned_bw_in,
+ log_a->assigned_bw_out);
for (c = 1; c < GNUNET_ATS_PropertyCount; c++)
{
struct LoggingAddress *log_a_cur;
struct LoggingAddress *log_a_next;
- if (GNUNET_SCHEDULER_NO_TASK != l->logging_task)
+ if (NULL != l->logging_task)
GNUNET_SCHEDULER_cancel (l->logging_task);
- l->logging_task = GNUNET_SCHEDULER_NO_TASK;
+ l->logging_task = NULL;
lts_next = l->head;
while (NULL != (lts_cur = lts_next))
/**
* Property Generators
*/
-
static struct PropertyGenerator *prop_gen_head;
static struct PropertyGenerator *prop_gen_tail;
+
static double
get_property (struct PropertyGenerator *pg)
{
static void
-set_prop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_prop_task (void *cls)
{
struct PropertyGenerator *pg = cls;
struct TestPeer *p;
double prop_value;
struct GNUNET_ATS_Information atsi;
- pg->set_task = GNUNET_SCHEDULER_NO_TASK;
+ pg->set_task = NULL;
if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains_value (sh->addresses,
&pg->test_peer->peer_id, pg->test_address->ats_addr))
}
if (NULL == (p = find_peer_by_id (pg->peer)))
{
+ GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Setting property generation for unknown peer %u\n",
pg->peer);
+ return;
}
if (NULL == (a = find_address_by_id (p, pg->address_id)))
{
+ GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Setting property generation for unknown peer %u\n",
pg->peer);
+ return;
}
prop_value = get_property (pg);
atsi.value = htonl ((uint32_t) prop_value);
/* set performance here! */
- sh->env.sf.s_bulk_start (sh->solver);
+ sh->sf->s_bulk_start (sh->sf->cls);
if (GNUNET_YES == opt_disable_normalization)
{
a->prop_abs[pg->ats_property] = prop_value;
a->prop_norm[pg->ats_property] = prop_value;
- sh->env.sf.s_address_update_property (sh->solver, a->ats_addr,
+ sh->sf->s_address_update_property (sh->sf->cls, a->ats_addr,
pg->ats_property, prop_value, prop_value);
}
else
- GAS_normalization_normalize_property (sh->addresses,
- pg->test_address->ats_addr, &atsi, 1);
- sh->env.sf.s_bulk_stop (sh->solver);
+ GAS_normalization_update_property (pg->test_address->ats_addr, &atsi, 1);
+ sh->sf->s_bulk_stop (sh->sf->cls);
pg->set_task = GNUNET_SCHEDULER_add_delayed (pg->frequency,
&set_prop_task, pg);
-
}
+
/**
* Set ats_property to 0 to find all pgs
*/
-
static struct PropertyGenerator *
find_prop_gen (unsigned int peer, unsigned int address,
uint32_t ats_property)
{
GNUNET_CONTAINER_DLL_remove (prop_gen_head, prop_gen_tail, pg);
- if (GNUNET_SCHEDULER_NO_TASK != pg->set_task)
+ if (NULL != pg->set_task)
{
GNUNET_SCHEDULER_cancel (pg->set_task);
- pg->set_task = GNUNET_SCHEDULER_NO_TASK;
+ pg->set_task = NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Removing old up preference generator peer [%u] address [%u] `%s'\n",
}
-
/**
* Stop all preferences generators
*/
/**
* Preference Generators
*/
-
static struct PreferenceGenerator *pref_gen_head;
static struct PreferenceGenerator *pref_gen_tail;
+
static double
get_preference (struct PreferenceGenerator *pg)
{
static void
-set_pref_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_feedback_task (void *cls)
+{
+ struct PreferenceGenerator *pg = cls;
+ struct TestPeer *p;
+ double feedback;
+ uint32_t bw_acc_out;
+ uint32_t bw_acc_in;
+ uint32_t delay_acc_in;
+ struct GNUNET_TIME_Relative dur;
+ double p_new;
+
+ pg->feedback_task = NULL;
+
+ if (NULL == (p = find_peer_by_id (pg->peer)))
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Setting feedback for unknown peer %u\n", pg->peer);
+ return;
+ }
+
+ switch (pg->kind)
+ {
+ case GNUNET_ATS_PREFERENCE_BANDWIDTH:
+ dur = GNUNET_TIME_absolute_get_duration(pg->feedback_last_bw_update);
+ bw_acc_in = dur.rel_value_us *pg->last_assigned_bw_in + pg->feedback_bw_in_acc;
+ pg->feedback_bw_in_acc = 0;
+
+ bw_acc_out = dur.rel_value_us *pg->last_assigned_bw_out + pg->feedback_bw_out_acc;
+ p_new = get_preference (pg);
+ feedback = (p_new / pg->pref_bw_old) * (bw_acc_in + bw_acc_out) /
+ (2 *GNUNET_TIME_absolute_get_duration(pg->feedback_last).rel_value_us);
+
+ break;
+ case GNUNET_ATS_PREFERENCE_LATENCY:
+ dur = GNUNET_TIME_absolute_get_duration(pg->feedback_last_delay_update);
+ delay_acc_in =dur.rel_value_us *pg->last_delay_value + pg->feedback_delay_acc;
+ pg->feedback_delay_acc = 0;
+
+ p_new = get_preference (pg);
+ feedback = (p_new / pg->pref_latency_old) * (delay_acc_in) /
+ (GNUNET_TIME_absolute_get_duration(pg->feedback_last).rel_value_us);
+
+ break;
+ default:
+ GNUNET_break (0);
+ feedback = 0.0;
+ break;
+ }
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Giving feedback for peer [%u] for client %p pref %s of %.3f\n",
+ pg->peer, NULL + (pg->client_id),
+ GNUNET_ATS_print_preference_type (pg->kind),
+ feedback);
+
+ sh->sf->s_feedback (sh->sf->cls, NULL + (pg->client_id), &p->peer_id,
+ pg->feedback_frequency, pg->kind, feedback);
+ pg->feedback_last = GNUNET_TIME_absolute_get();
+
+
+ pg->feedback_bw_out_acc = 0;
+ pg->feedback_bw_in_acc = 0;
+ pg->feedback_last_bw_update = GNUNET_TIME_absolute_get();
+
+ pg->feedback_delay_acc = 0;
+ pg->feedback_last_delay_update = GNUNET_TIME_absolute_get();
+
+
+ pg->feedback_task = GNUNET_SCHEDULER_add_delayed (pg->feedback_frequency,
+ &set_feedback_task, pg);
+}
+
+
+static void
+set_pref_task (void *cls)
{
struct PreferenceGenerator *pg = cls;
struct TestPeer *p;
double pref_value;
- pg->set_task = GNUNET_SCHEDULER_NO_TASK;
+ pg->set_task = NULL;
if (NULL == (p = find_peer_by_id (pg->peer)))
{
}
pref_value = get_preference (pg);
+ switch (pg->kind) {
+ case GNUNET_ATS_PREFERENCE_BANDWIDTH:
+ pg->pref_bw_old = pref_value;
+ break;
+ case GNUNET_ATS_PREFERENCE_LATENCY:
+ pg->pref_latency_old = pref_value;
+ break;
+ default:
+ break;
+ }
+
p->pref_abs[pg->kind] = pref_value;
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
pg->peer, NULL + (pg->client_id),
GNUNET_ATS_print_preference_type (pg->kind), pref_value);
- sh->env.sf.s_bulk_start (sh->solver);
if (GNUNET_YES == opt_disable_normalization)
{
p->pref_abs[pg->kind] = pref_value;
p->pref_norm[pg->kind] = pref_value;
- sh->env.sf.s_pref (sh->solver, &p->peer_id, pg->kind, pref_value);
+ sh->sf->s_pref (sh->sf->cls, &p->peer_id, pg->kind, pref_value);
}
else
- GAS_normalization_normalize_preference (NULL + (pg->client_id),
- &p->peer_id, pg->kind, pref_value);
- sh->env.sf.s_bulk_stop (sh->solver);
-
- switch (pg->kind) {
- case GNUNET_ATS_PREFERENCE_BANDWIDTH:
- //p->pref_bandwidth = pref_value;
- break;
- case GNUNET_ATS_PREFERENCE_LATENCY:
- //p->pref_delay = pref_value;
- break;
- default:
- break;
- }
+ update_preference (NULL + (pg->client_id),
+ &p->peer_id,
+ pg->kind,
+ pref_value);
pg->set_task = GNUNET_SCHEDULER_add_delayed (pg->frequency,
- set_pref_task, pg);
-
+ &set_pref_task,
+ pg);
}
+
static struct PreferenceGenerator *
find_pref_gen (unsigned int peer, enum GNUNET_ATS_PreferenceKind kind)
{
{
GNUNET_CONTAINER_DLL_remove (pref_gen_head, pref_gen_tail, pg);
- if (GNUNET_SCHEDULER_NO_TASK != pg->set_task)
+ if (NULL != pg->feedback_task)
+ {
+ GNUNET_SCHEDULER_cancel (pg->feedback_task);
+ pg->feedback_task = NULL;
+ }
+
+ if (NULL != pg->set_task)
{
GNUNET_SCHEDULER_cancel (pg->set_task);
- pg->set_task = GNUNET_SCHEDULER_NO_TASK;
+ pg->set_task = NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Removing old up preference generator peer [%u] `%s'\n",
}
+static struct TestAddress*
+find_active_address (struct TestPeer *p)
+{
+ struct TestAddress *cur;
+ for (cur = p->addr_head; NULL != cur; cur = cur->next)
+ if (GNUNET_YES == cur->ats_addr->active)
+ return cur;
+ return NULL;
+}
+
+
/**
* Generate between the source master and the partner and set property with a
* value depending on the generator.
* @param period duration of a period of generation (~ 1/frequency)
* @param frequency how long to generate property
* @param kind ATS preference to generate
+ * @param feedback_frequency how often to give feedback
* @return the preference generator
*/
struct PreferenceGenerator *
long int value_rate,
struct GNUNET_TIME_Relative period,
struct GNUNET_TIME_Relative frequency,
- enum GNUNET_ATS_PreferenceKind kind)
+ enum GNUNET_ATS_PreferenceKind kind,
+ struct GNUNET_TIME_Relative feedback_frequency)
{
struct PreferenceGenerator *pg;
+ struct TestPeer *p;
+
+ if (NULL == (p = find_peer_by_id (peer)))
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Starting preference for unknown peer %u\n", peer);
+ return NULL;
+ }
pg = GNUNET_new (struct PreferenceGenerator);
GNUNET_CONTAINER_DLL_insert (pref_gen_head, pref_gen_tail, pg);
pg->duration_period = period;
pg->frequency = frequency;
pg->time_start = GNUNET_TIME_absolute_get();
+ pg->feedback_frequency = feedback_frequency;
switch (type) {
case GNUNET_ATS_TEST_TG_CONSTANT:
}
pg->set_task = GNUNET_SCHEDULER_add_now (&set_pref_task, pg);
+ if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != feedback_frequency.rel_value_us)
+ {
+ struct TestAddress * addr = find_active_address(p);
+
+ pg->last_assigned_bw_in = p->assigned_bw_in;
+ pg->last_assigned_bw_out = p->assigned_bw_out;
+ pg->feedback_bw_in_acc = 0;
+ pg->feedback_bw_out_acc = 0;
+ pg->last_delay_value = addr->prop_norm[GNUNET_ATS_QUALITY_NET_DELAY];
+ pg->feedback_delay_acc = 0;
+
+ pg->feedback_last_bw_update = GNUNET_TIME_absolute_get();
+ pg->feedback_last_delay_update = GNUNET_TIME_absolute_get();
+ pg->feedback_last = GNUNET_TIME_absolute_get();
+ pg->feedback_task = GNUNET_SCHEDULER_add_delayed (feedback_frequency,
+ &set_feedback_task, pg);
+ }
+
return pg;
}
/**
* Experiments
*/
-
-const char *
+static const char *
print_op (enum OperationType op)
{
switch (op) {
return "";
}
+
static struct Experiment *
create_experiment ()
{
return e;
}
+
static void
free_experiment (struct Experiment *e)
{
GNUNET_STRINGS_utf8_toupper (op_network,op_network);
if (0 == strcmp(op_network, "UNSPECIFIED"))
{
- o->address_network = GNUNET_ATS_NET_UNSPECIFIED;
+ o->address_network = GNUNET_NT_UNSPECIFIED;
}
else if (0 == strcmp(op_network, "LOOPBACK"))
{
- o->address_network = GNUNET_ATS_NET_LOOPBACK;
+ o->address_network = GNUNET_NT_LOOPBACK;
}
else if (0 == strcmp(op_network, "LAN"))
{
- o->address_network = GNUNET_ATS_NET_LAN;
+ o->address_network = GNUNET_NT_LAN;
}
else if (0 == strcmp(op_network, "WAN"))
{
- o->address_network = GNUNET_ATS_NET_WAN;
+ o->address_network = GNUNET_NT_WAN;
}
else if (0 == strcmp(op_network, "WLAN"))
{
- o->address_network = GNUNET_ATS_NET_WLAN;
+ o->address_network = GNUNET_NT_WLAN;
}
else if (0 == strcmp(op_network, "BT"))
{
- o->address_network = GNUNET_ATS_NET_BT;
+ o->address_network = GNUNET_NT_BT;
}
else
{
return GNUNET_OK;
}
+
static int
load_op_del_address (struct GNUNET_ATS_TEST_Operation *o,
struct Episode *e,
return GNUNET_OK;
}
+
static enum GNUNET_ATS_Property
parse_preference_string (const char * str)
{
if (0 == strcmp(str, props[c]))
return c;
return 0;
-};
+}
+
static int
load_op_start_set_preference (struct GNUNET_ATS_TEST_Operation *o,
GNUNET_free (pref);
GNUNET_free (op_name);
+ /* Get feedback delay */
+ GNUNET_asprintf(&op_name, "op-%u-feedback_delay", op_counter);
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_time (cfg,
+ sec_name, op_name, &o->feedback_delay))
+ {
+ fprintf (stderr, "Using feedback delay %llu in operation %u `%s' in episode %u\n",
+ (long long unsigned int) o->feedback_delay.rel_value_us,
+ op_counter, op_name, e->id);
+ }
+ else
+ o->feedback_delay = GNUNET_TIME_UNIT_FOREVER_REL;
+ GNUNET_free (op_name);
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Found operation %s: [%llu:%llu]: %s = %llu\n",
"START_SET_PREFERENCE", o->peer_id, o->address_id,
return GNUNET_OK;
}
+
static int
load_op_stop_set_preference (struct GNUNET_ATS_TEST_Operation *o,
struct Episode *e,
return GNUNET_OK;
}
+
static enum GNUNET_ATS_Property
-parse_property_string (const char * str)
+parse_property_string (const char *str)
{
- int c = 0;
- char *props[GNUNET_ATS_PropertyCount] = GNUNET_ATS_PropertyStrings;
+ enum GNUNET_ATS_Property c;
for (c = 0; c < GNUNET_ATS_PropertyCount; c++)
- if (0 == strcmp(str, props[c]))
+ if (0 == strcmp(str,
+ GNUNET_ATS_print_property_type (c)))
return c;
return 0;
-};
+}
+
static int
load_op_start_set_property(struct GNUNET_ATS_TEST_Operation *o,
return e_counter;
}
+
static void
-timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_experiment (void *cls)
{
struct Experiment *e = cls;
- e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+
+ e->experiment_timeout_task = NULL;
fprintf (stderr, "Experiment timeout!\n");
- if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+ if (NULL != e->episode_timeout_task)
{
GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
- e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ e->episode_timeout_task = NULL;
}
e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
aa->addr_len = plugin_addr_len;
aa->addr = &aa[1];
aa->plugin = (char *) &aa[1] + plugin_addr_len;
- memcpy (&aa[1], plugin_addr, plugin_addr_len);
- memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1);
+ GNUNET_memcpy (&aa[1], plugin_addr, plugin_addr_len);
+ GNUNET_memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1);
aa->session_id = session_id;
- aa->active = GNUNET_NO;
- aa->used = GNUNET_NO;
- aa->solver_information = NULL;
- aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0);
- aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0);
return aa;
}
{
p = GNUNET_new (struct TestPeer);
p->id = op->peer_id;
+ p->assigned_bw_in = 0;
+ p->assigned_bw_out = 0;
memset (&p->peer_id, op->peer_id, sizeof (p->peer_id));
for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
{
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Adding address %u for peer %u in network `%s'\n",
- op->address_id, op->peer_id, GNUNET_ATS_print_network_type(a->network));
+ op->address_id, op->peer_id, GNUNET_NT_to_string(a->network));
- sh->env.sf.s_add (sh->solver, a->ats_addr, op->address_network);
+ sh->sf->s_add (sh->sf->cls, a->ats_addr, op->address_network);
}
GNUNET_ATS_solver_generate_property_stop (pg);
}
- GNUNET_CONTAINER_DLL_remove(p->addr_head, p->addr_tail, a);
- GNUNET_CONTAINER_multipeermap_remove (sh->addresses, &p->peer_id, a->ats_addr);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (sh->addresses,
+ &p->peer_id,
+ a->ats_addr));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Removing address %u for peer %u\n",
+ op->address_id,
+ op->peer_id);
+
+ sh->sf->s_del (sh->sf->cls, a->ats_addr);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Removing address %u for peer %u\n",
- op->address_id, op->peer_id);
+ if (NULL != l)
+ {
+ GNUNET_ATS_solver_logging_now (l);
+ }
+ GNUNET_CONTAINER_DLL_remove(p->addr_head, p->addr_tail, a);
- sh->env.sf.s_del (sh->solver, a->ats_addr, GNUNET_NO);
GNUNET_free_non_null(a->ats_addr->atsi);
GNUNET_free (a->ats_addr);
GNUNET_free (a);
struct PropertyGenerator *pg = find_prop_gen(op->peer_id, op->address_id,
op->prop_type);
if (NULL != pg)
- GNUNET_ATS_solver_generate_property_stop (pg);
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Stopping preference generation for peer %u address %u\n", op->peer_id,
+ op->address_id);
+ GNUNET_ATS_solver_generate_property_stop (pg);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Cannot find preference generator for peer %u address %u\n",
+ op->peer_id, op->address_id);
+ GNUNET_break (0);
+ }
}
static void
op->max_rate,
op->period,
op->frequency,
- op->pref_type);
+ op->pref_type,
+ op->frequency);
}
static void
struct PreferenceGenerator *pg = find_pref_gen(op->peer_id,
op->pref_type);
if (NULL != pg)
- GNUNET_ATS_solver_generate_preferences_stop (pg);
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Stopping property generation for peer %u address %u\n", op->peer_id,
+ op->address_id);
+ GNUNET_ATS_solver_generate_preferences_stop (pg);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Cannot find preference generator for peer %u address %u\n",
+ op->peer_id, op->address_id);
+ GNUNET_break (0);
+ }
}
enforce_start_request (struct GNUNET_ATS_TEST_Operation *op)
{
struct TestPeer *p;
- const struct ATS_Address *res;
if (NULL == (p = find_peer_by_id (op->peer_id)))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting address for peer %u\n",
op->peer_id);
+ p->is_requested = GNUNET_YES;
- res = sh->env.sf.s_get (sh->solver, &p->peer_id);
- if (NULL != res)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting address for peer %u: %llu %llu\n",
- op->peer_id,
- ntohl(res->assigned_bw_in.value__),
- ntohl(res->assigned_bw_out.value__));
- }
+ sh->sf->s_get (sh->sf->cls, &p->peer_id);
}
+
static void
enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op)
{
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop requesting address for peer %u\n",
- op->peer_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Stop requesting address for peer %u\n",
+ op->peer_id);
+ p->is_requested = GNUNET_NO;
+ p->assigned_bw_in = 0;
+ p->assigned_bw_out = 0;
+ sh->sf->s_get_stop (sh->sf->cls, &p->peer_id);
+
+ if (NULL != l)
+ {
+ GNUNET_ATS_solver_logging_now (l);
+ }
- sh->env.sf.s_get_stop (sh->solver, &p->peer_id);
}
static void enforce_episode (struct Episode *ep)
}
}
+
static void
-timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+timeout_episode (void *cls)
{
struct Experiment *e = cls;
- e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+
+ e->episode_timeout_task = NULL;
if (NULL != e->ep_done_cb)
e->ep_done_cb (e->cur);
{
/* done */
fprintf (stderr, "Last episode done!\n");
- if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task)
+ if (NULL != e->experiment_timeout_task)
{
GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
- e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ e->experiment_timeout_task = NULL;
}
e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time), GNUNET_OK);
return;
void
GNUNET_ATS_solvers_experimentation_stop (struct Experiment *e)
{
- if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task)
+ if (NULL != e->experiment_timeout_task)
{
GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
- e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ e->experiment_timeout_task = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+ if (NULL != e->episode_timeout_task)
{
GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
- e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ e->episode_timeout_task = NULL;
}
if (NULL != e->cfg)
{
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "experiment",
"name", &e->name))
{
- fprintf (stderr, "Invalid %s", "name");
+ fprintf (stderr, "Invalid %s \n", "name");
free_experiment (e);
return NULL;
}
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "experiment",
"log_prefix", &e->log_prefix))
{
- fprintf (stderr, "Invalid %s", "name");
+ fprintf (stderr, "Invalid %s \n", "log_prefix");
free_experiment (e);
return NULL;
}
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_filename (cfg, "experiment",
"cfg_file", &e->cfg_file))
{
- fprintf (stderr, "Invalid %s", "cfg_file");
+ fprintf (stderr, "Invalid %s \n", "cfg_file");
free_experiment (e);
return NULL;
}
e->cfg = GNUNET_CONFIGURATION_create();
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (e->cfg, e->cfg_file))
{
- fprintf (stderr, "Invalid configuration %s", "cfg_file");
+ fprintf (stderr, "Invalid configuration %s \n", "cfg_file");
free_experiment (e);
return NULL;
}
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time(cfg, "experiment",
"log_freq", &e->log_freq))
{
- fprintf (stderr, "Invalid %s", "log_freq");
+ fprintf (stderr, "Invalid %s \n", "log_freq");
free_experiment (e);
return NULL;
}
{
GNUNET_STATISTICS_destroy ((struct GNUNET_STATISTICS_Handle *) sh->env.stats,
GNUNET_NO);
- GNUNET_PLUGIN_unload (sh->plugin, sh->solver);
-
+ GNUNET_PLUGIN_unload (sh->plugin, sh->sf);
+ sh->sf = NULL;
GAS_normalization_stop();
- GNUNET_CONTAINER_multipeermap_iterate (sh->addresses, &free_all_it, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (sh->addresses,
+ &free_all_it,
+ NULL);
GNUNET_CONTAINER_multipeermap_destroy(sh->addresses);
GNUNET_free (sh->plugin);
GNUNET_free (sh);
}
+
/**
* Load quotas for networks from configuration
*
unsigned long long *in_dest,
int dest_length)
{
- char *network_str[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
char * entry_in = NULL;
char * entry_out = NULL;
char * quota_out_str;
int c;
int res;
- for (c = 0; (c < GNUNET_ATS_NetworkTypeCount) && (c < dest_length); c++)
+ for (c = 0; (c < GNUNET_NT_COUNT) && (c < dest_length); c++)
{
in_dest[c] = 0;
out_dest[c] = 0;
- GNUNET_asprintf (&entry_out, "%s_QUOTA_OUT", network_str[c]);
- GNUNET_asprintf (&entry_in, "%s_QUOTA_IN", network_str[c]);
+ GNUNET_asprintf (&entry_out,
+ "%s_QUOTA_OUT",
+ GNUNET_NT_to_string (c));
+ GNUNET_asprintf (&entry_in,
+ "%s_QUOTA_IN",
+ GNUNET_NT_to_string (c));
/* quota out */
if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_out, "a_out_str))
if (GNUNET_NO == res)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n"),
- network_str[c], quota_out_str, GNUNET_ATS_DefaultBandwidth);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n"),
+ GNUNET_NT_to_string (c),
+ quota_out_str,
+ GNUNET_ATS_DefaultBandwidth);
out_dest[c] = GNUNET_ATS_DefaultBandwidth;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Outbound quota configure for network `%s' is %llu\n"),
- network_str[c], out_dest[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Outbound quota configure for network `%s' is %llu\n",
+ GNUNET_NT_to_string (c),
+ out_dest[c]);
}
GNUNET_free (quota_out_str);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("No outbound quota configured for network `%s', assigning default bandwidth %llu\n"),
- network_str[c], GNUNET_ATS_DefaultBandwidth);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("No outbound quota configured for network `%s', assigning default bandwidth %llu\n"),
+ GNUNET_NT_to_string (c),
+ GNUNET_ATS_DefaultBandwidth);
out_dest[c] = GNUNET_ATS_DefaultBandwidth;
}
if (GNUNET_NO == res)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n"),
- network_str[c], quota_in_str, GNUNET_ATS_DefaultBandwidth);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not load quota for network `%s': `%s', assigning default bandwidth %llu\n"),
+ GNUNET_NT_to_string (c),
+ quota_in_str,
+ GNUNET_ATS_DefaultBandwidth);
in_dest[c] = GNUNET_ATS_DefaultBandwidth;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Inbound quota configured for network `%s' is %llu\n"),
- network_str[c], in_dest[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Inbound quota configured for network `%s' is %llu\n",
+ GNUNET_NT_to_string (c),
+ in_dest[c]);
}
GNUNET_free (quota_in_str);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("No outbound quota configure for network `%s', assigning default bandwidth %llu\n"),
- network_str[c], GNUNET_ATS_DefaultBandwidth);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("No outbound quota configure for network `%s', assigning default bandwidth %llu\n"),
+ GNUNET_NT_to_string (c),
+ GNUNET_ATS_DefaultBandwidth);
out_dest[c] = GNUNET_ATS_DefaultBandwidth;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Loaded quota for network `%s' (in/out): %llu %llu\n", network_str[c], in_dest[c], out_dest[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Loaded quota for network `%s' (in/out): %llu %llu\n",
+ GNUNET_NT_to_string (c),
+ in_dest[c],
+ out_dest[c]);
GNUNET_free (entry_out);
GNUNET_free (entry_in);
}
- return GNUNET_ATS_NetworkTypeCount;
+ return GNUNET_NT_COUNT;
}
+
/**
* Information callback for the solver
*
*/
static void
solver_info_cb (void *cls,
- enum GAS_Solver_Operation op,
- enum GAS_Solver_Status stat,
- enum GAS_Solver_Additional_Information add)
+ enum GAS_Solver_Operation op,
+ enum GAS_Solver_Status stat,
+ enum GAS_Solver_Additional_Information add)
{
char *add_info;
switch (add) {
static void
solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address)
{
- if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
- (0 == ntohl (address->assigned_bw_in.value__)) )
+ struct GNUNET_TIME_Relative duration;
+ struct TestPeer *p;
+ static struct PreferenceGenerator *pg;
+ uint32_t delta;
+ if ( (0 == address->assigned_bw_out) && (0 == address->assigned_bw_in) )
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Solver notified to disconnect peer `%s'\n",
GNUNET_i2s (&address->peer));
+ }
+ p = find_peer_by_pid(&address->peer);
+ if (NULL == p)
return;
+ p->assigned_bw_out = address->assigned_bw_out;
+ p->assigned_bw_in = address->assigned_bw_in;
+
+ for (pg = pref_gen_head; NULL != pg; pg = pg->next)
+ {
+ if (pg->peer == p->id)
+ {
+ duration = GNUNET_TIME_absolute_get_duration(pg->feedback_last_bw_update);
+ delta = duration.rel_value_us * pg->last_assigned_bw_out;
+ pg->feedback_bw_out_acc += delta;
+
+ delta = duration.rel_value_us * pg->last_assigned_bw_in;
+ pg->feedback_bw_in_acc += delta;
+
+ pg->last_assigned_bw_in = address->assigned_bw_in;
+ pg->last_assigned_bw_out = address->assigned_bw_out;
+ pg->feedback_last_bw_update = GNUNET_TIME_absolute_get();
+ }
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
- GNUNET_i2s (&address->peer),
- address,
- (unsigned int) ntohl (address->assigned_bw_out.value__),
- (unsigned int) ntohl (address->assigned_bw_in.value__));
- /*if (GNUNET_YES == ph.bulk_running)
- GNUNET_break (0);*/
+ "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
+ GNUNET_i2s (&address->peer),
+ address,
+ address->assigned_bw_out,
+ address->assigned_bw_in);
+
+ if (NULL != l)
+ GNUNET_ATS_solver_logging_now (l);
+
return;
}
return p->pref_abs;
}
else
- return GAS_normalization_get_preferences_by_peer (id);
-}
-
-
-const double *
-get_property_cb (void *cls, const struct ATS_Address *address)
-{
- struct TestPeer *p;
- struct TestAddress *a;
-
- if (GNUNET_YES == opt_disable_normalization)
- {
- p = find_peer_by_pid (&address->peer);
- a = find_address_by_ats_address (p, address);
- return a->prop_abs;
- }
- else
- return GAS_normalization_get_properties ((struct ATS_Address *) address);
-}
-
-static void
-set_updated_property ( struct ATS_Address *address, uint32_t type, double prop_rel)
-{
- struct TestPeer *p;
- struct TestAddress *a;
-
- if (NULL == (p = find_peer_by_pid (&address->peer)))
- {
- GNUNET_break (0);
- return;
- }
-
- if (NULL == (a = find_address_by_ats_address (p, address)))
- {
- GNUNET_break (0);
- return;
- }
- a->prop_norm[type] = prop_rel;
- sh->env.sf.s_address_update_property (sh->solver, address, type, a->prop_abs [type], prop_rel);
-}
-
-
-static void
-normalized_property_changed_cb (void *cls, struct ATS_Address *address,
- uint32_t type, double prop_rel)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Normalized property %s for peer `%s' changed to %.3f \n",
- GNUNET_ATS_print_property_type (type), GNUNET_i2s (&address->peer),
- prop_rel);
-
- set_updated_property (address, type, prop_rel);
-}
-
-static void
-set_updated_preference (const struct GNUNET_PeerIdentity *peer,
- enum GNUNET_ATS_PreferenceKind kind,
- double pref_rel)
-{
- struct TestPeer *p;
-
- if (NULL == (p = find_peer_by_pid (peer)))
- {
- GNUNET_break (0);
- return;
- }
-
- p->pref_norm[kind] = pref_rel;
- sh->env.sf.s_pref (sh->solver, peer, kind, pref_rel);
-}
-
-
-static void
-normalized_preference_changed_cb (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- enum GNUNET_ATS_PreferenceKind kind,
- double pref_rel)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Normalized preference %s for peer `%s' changed to %.3f \n",
- GNUNET_ATS_print_preference_type (kind), GNUNET_i2s (peer),
- pref_rel);
-
- set_updated_preference(peer, kind, pref_rel);
+ return GAS_preference_get_by_peer (NULL,
+ id);
}
{
struct SolverHandle *sh;
char * solver_str;
- int c;
switch (type) {
case GNUNET_ATS_SOLVER_PROPORTIONAL:
}
sh = GNUNET_new (struct SolverHandle);
- GNUNET_asprintf (&sh->plugin, "libgnunet_plugin_ats_%s", solver_str);
-
+ GNUNET_asprintf (&sh->plugin,
+ "libgnunet_plugin_ats_%s",
+ solver_str);
sh->addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+
/* setup environment */
sh->env.cfg = e->cfg;
sh->env.stats = GNUNET_STATISTICS_create ("ats", e->cfg);
sh->env.addresses = sh->addresses;
sh->env.bandwidth_changed_cb = &solver_bandwidth_changed_cb;
sh->env.get_preferences = &get_preferences_cb;
- sh->env.get_property = &get_property_cb;
- sh->env.network_count = GNUNET_ATS_NetworkTypeCount;
+ sh->env.network_count = GNUNET_NT_COUNT;
sh->env.info_cb = &solver_info_cb;
- sh->env.info_cb_cls = NULL;
- sh->env.network_count = GNUNET_ATS_NetworkTypeCount;
- int networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
- for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
- sh->env.networks[c] = networks[c];
-
+ sh->env.network_count = GNUNET_NT_COUNT;
/* start normalization */
- GAS_normalization_start (&normalized_preference_changed_cb, NULL,
- &normalized_property_changed_cb, NULL );
+ GAS_normalization_start ();
/* load quotas */
- if (GNUNET_ATS_NetworkTypeCount != GNUNET_ATS_solvers_load_quotas (e->cfg,
- sh->env.out_quota, sh->env.in_quota, GNUNET_ATS_NetworkTypeCount))
+ if (GNUNET_NT_COUNT != GNUNET_ATS_solvers_load_quotas (e->cfg,
+ sh->env.out_quota, sh->env.in_quota, GNUNET_NT_COUNT))
{
GNUNET_break(0);
GNUNET_free (sh->plugin);
return NULL;
}
- sh->solver = GNUNET_PLUGIN_load (sh->plugin, &sh->env);
- if (NULL == sh->solver)
+ sh->sf = GNUNET_PLUGIN_load (sh->plugin, &sh->env);
+ if (NULL == sh->sf)
{
fprintf (stderr, "Failed to load solver `%s'\n", sh->plugin);
GNUNET_break(0);
return sh;
}
+
static void
done ()
{
static struct GNUNET_GETOPT_CommandLineOption options[] =
{
- { 's', "solver", NULL,
- gettext_noop ("solver to use"),
- 1, &GNUNET_GETOPT_set_string, &opt_solver},
- { 'e', "experiment", NULL,
- gettext_noop ("experiment to use"),
- 1, &GNUNET_GETOPT_set_string, &opt_exp_file},
- { 'V', "verbose", NULL,
- gettext_noop ("be verbose"),
- 0, &GNUNET_GETOPT_set_one, &opt_verbose},
- { 'p', "print", NULL,
- gettext_noop ("print logging"),
- 0, &GNUNET_GETOPT_set_one, &opt_print},
- { 'f', "file", NULL,
- gettext_noop ("save logging to disk"),
- 0, &GNUNET_GETOPT_set_one, &opt_save},
- { 'd', "dn", NULL,
- gettext_noop ("disable normalization"),
- 0, &GNUNET_GETOPT_set_one, &opt_disable_normalization},
+ GNUNET_GETOPT_option_string ('s',
+ "solver",
+ gettext_noop ("solver to use"),
+ &opt_solver),
+
+ GNUNET_GETOPT_option_string ('e',
+ "experiment"
+ gettext_noop ("experiment to use"),
+ &opt_exp_file),
+
+ GNUNET_GETOPT_option_verbose (&opt_verbose),
+
+ GNUNET_GETOPT_option_flag ('p',
+ "print",
+ gettext_noop ("print logging"),
+ &opt_print),
+
+ GNUNET_GETOPT_option_flag ('f',
+ "file",
+ gettext_noop ("save logging to disk"),
+ &opt_save),
+
+ GNUNET_GETOPT_option_flag ('d',
+ "dn",
+ gettext_noop ("disable normalization"),
+ &opt_disable_normalization),
+
GNUNET_GETOPT_OPTION_END
};
return res;
}
/* end of file ats-testing-experiment.c*/
-
projects / oweals / gnunet.git / blobdiff