/*
This file is part of GNUnet.
- (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010,2011 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/perf_ats_solver.c
#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
#include "gnunet-service-ats_addresses.h"
-
+#include "gnunet-service-ats_plugins.h"
+#include "gnunet-service-ats_normalization.h"
+#include "gnunet-service-ats_preferences.h"
#include "gnunet_ats_service.h"
#include "gnunet_ats_plugin.h"
#include "test_ats_api_common.h"
#define DEFAULT_ATS_COUNT 2
+/**
+ * Handle for statistics.
+ */
+struct GNUNET_STATISTICS_Handle *GSA_stats;
+
/**
* Handle for ATS address component
*/
/**
* Solver handle
*/
- void *solver;
+ struct GNUNET_ATS_SolverFunctions *sf;
/**
* Statistics stat;
GNUNET_free_non_null (ph.iterations_results);
GAS_normalization_stop ();
+ GAS_preference_done ();
ret = res;
}
GNUNET_i2s (&cur->peer), cur,
"GNUNET_ATS_QUALITY_NET_DELAY",
abs_val, rel_val);
- ph.env.sf.s_address_update_property (ph.solver, cur,
+ ph.sf->s_address_update_property (ph.sf->cls, cur,
GNUNET_ATS_QUALITY_NET_DELAY,
abs_val, rel_val);
break;
"Updating peer `%s' address %p type %s abs val %u rel val %.3f\n",
GNUNET_i2s (&cur->peer), cur, "GNUNET_ATS_QUALITY_NET_DISTANCE",
abs_val, rel_val);
- ph.env.sf.s_address_update_property (ph.solver, cur,
+ ph.sf->s_address_update_property (ph.sf->cls, cur,
GNUNET_ATS_QUALITY_NET_DISTANCE,
abs_val, rel_val);
break;
default:
break;
}
- ph.env.sf.s_address_update_inuse (ph.solver, cur, GNUNET_YES);
}
bandwidth_changed_cb (void *cls,
struct ATS_Address *address)
{
- if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
- (0 == ntohl (address->assigned_bw_in.value__)) )
+ if ( (0 == address->assigned_bw_out) && (0 == address->assigned_bw_in) )
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"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__));
+ address->assigned_bw_out,
+ address->assigned_bw_in);
if (GNUNET_YES == ph.bulk_running)
GNUNET_break (0);
return;
}
-const double *
+static const double *
get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
{
- return GAS_normalization_get_preferences_by_peer (id);
-}
-
-
-const double *
-get_property_cb (void *cls, const struct ATS_Address *address)
-{
- return GAS_normalization_get_properties ((struct ATS_Address *) address);
+ return GAS_preference_get_by_peer (NULL, id);
}
-static void
-normalized_property_changed_cb (void *cls, struct ATS_Address *peer,
- uint32_t type, double prop_rel)
-{
- /* TODO */
-}
static void
-perf_address_initial_update (void *solver,
+perf_address_initial_update (void *dead,
struct GNUNET_CONTAINER_MultiPeerMap * addresses,
struct ATS_Address *address)
{
double distance;
uint32_t random = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
delay = (100 + (double) random) / 100;
- ph.env.sf.s_address_update_property (solver, address, GNUNET_ATS_QUALITY_NET_DELAY,
+ ph.sf->s_address_update_property (ph.sf->cls,
+ address, GNUNET_ATS_QUALITY_NET_DELAY,
100, delay);
random = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
distance = (100 + (double) random) / 100;
- ph.env.sf.s_address_update_property (solver, address,
- GNUNET_ATS_QUALITY_NET_DISTANCE, 10, distance);
+ ph.sf->s_address_update_property (ph.sf->cls, address,
+ GNUNET_ATS_QUALITY_NET_DISTANCE,
+ 10, distance);
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Initial update address %p : %.2f %.2f\n", address, delay, distance);
+ "Initial update address %p : %.2f %.2f\n",
+ address, delay, distance);
}
+
+struct DUA_Ctx
+{
+ int r;
+ int c_cur_a;
+};
+
+
+static int
+do_update_address (void *cls,
+ const struct GNUNET_PeerIdentity *pid,
+ void *value)
+{
+ struct DUA_Ctx *ctx = cls;
+ struct ATS_Address *addr = value;
+
+ if (ctx->c_cur_a == ctx->r)
+ perf_update_address (addr);
+ ctx->c_cur_a++;
+ return GNUNET_OK;
+}
+
+
/**
* Update a certain percentage of peers
*
* @param ca the current number of addresses
* @param percentage_peers the percentage of peers to update
*/
-
static void
perf_update_all_addresses (unsigned int cp, unsigned int ca, unsigned int percentage_peers)
{
- struct ATS_Address *cur_address;
int c_peer;
int c_select;
int c_cur_p;
- int c_cur_a;
int r;
int count;
unsigned int m[cp];
+ struct DUA_Ctx dua_ctx;
count = cp * ((double) percentage_peers / 100);
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
{
r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, ca);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Updating peer [%u] address [%u]\n", c_cur_p, r);
-
- c_cur_a = 0;
- for (cur_address = ph.peers[c_cur_p].head; NULL != cur_address; cur_address = cur_address->next)
- {
- if (c_cur_a == r)
- perf_update_address (cur_address);
- c_cur_a ++;
- }
+ "Updating peer [%u] address [%u]\n", c_cur_p, r);
+
+ dua_ctx.c_cur_a = 0;
+ dua_ctx.r = r;
+ GNUNET_CONTAINER_multipeermap_get_multiple (ph.addresses,
+ &ph.peers[c_cur_p].id,
+ &do_update_address,
+ &dua_ctx);
}
}
}
perf_create_address (int cp, int ca)
{
struct ATS_Address *a;
+
a = create_address (&ph.peers[cp].id,
"Test 1", "test 1", strlen ("test 1") + 1, 0);
- GNUNET_CONTAINER_DLL_insert (ph.peers[cp].head, ph.peers[cp].tail, a);
GNUNET_CONTAINER_multipeermap_put (ph.addresses, &ph.peers[cp].id, a,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
return a;
for (cp = ph.N_peers_start; cp <= ph.N_peers_end; cp ++)
{
- cur = ph.iterations_results[ph.current_iteration-1].results_array[cp];
+ cur = ph.iterations_results[ph.current_iteration-1].results_array[cp];
if (0 == cp)
continue;
if (NULL == cur)
GNUNET_break (0);
fprintf (stderr,
"Missing result for %u peers\n", cp);
+ continue;
}
(unsigned long long )cur->d_mlp_full.rel_value_us);
}
}
+}
+
+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
*/
GNUNET_free_non_null (data_fn_update);
}
+
+static int
+do_delete_address (void *cls,
+ const struct GNUNET_PeerIdentity *pid,
+ void *value)
+{
+ struct ATS_Address *cur = value;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting addresses for peer %u\n",
+ pid);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_remove (ph.addresses,
+ pid,
+ cur));
+ ph.sf->s_del (ph.sf->cls, cur);
+ GNUNET_free_non_null (cur->atsi);
+ GNUNET_free (cur);
+ return GNUNET_OK;
+}
+
+
/**
* Run a performance iteration
*/
-
static void
perf_run_iteration (void)
{
- struct ATS_Address *cur;
- struct ATS_Address *next;
int cp;
int ca;
int count_p = ph.N_peers_end;
if (GNUNET_NO == ph.bulk_running)
{
ph.bulk_running = GNUNET_YES;
- ph.env.sf.s_bulk_start (ph.solver);
+ ph.sf->s_bulk_start (ph.sf->cls);
}
ph.current_p = cp + 1;
for (ca = 0; ca < count_a; ca++)
/* Add address */
/* Random network selection */
- //net = 1 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_ATS_NetworkTypeCount - 1);
+ //net = 1 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_NT_COUNT - 1);
/* Random equally distributed network selection */
- net = 1 + (ca % (GNUNET_ATS_NetworkTypeCount - 1));
+ net = 1 + (ca % (GNUNET_NT_COUNT - 1));
/* fprintf (stderr, "Network: %u `%s'\n",
- * mod_net , GNUNET_ATS_print_network_type(mod_net)); */
+ * mod_net , GNUNET_NT_to_string(mod_net)); */
cur_addr->atsi = GNUNET_new (struct GNUNET_ATS_Information);
cur_addr->atsi_count = 1;
cur_addr->atsi[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
cur_addr->atsi[0].value = htonl (net);
- ph.env.sf.s_add (ph.solver, cur_addr, net);
+ ph.sf->s_add (ph.sf->cls, cur_addr, net);
ph.current_a = ca + 1;
- perf_address_initial_update (ph.solver, ph.addresses, cur_addr);
+ perf_address_initial_update (NULL, ph.addresses, cur_addr);
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"Adding address for peer %u address %u in network %s\n", cp, ca,
- GNUNET_ATS_print_network_type(net));
+ GNUNET_NT_to_string(net));
}
/* Notify solver about request */
- ph.env.sf.s_get (ph.solver, &ph.peers[cp].id);
+ ph.sf->s_get (ph.sf->cls, &ph.peers[cp].id);
if (cp + 1 >= ph.N_peers_start)
{
{
ph.expecting_solution = GNUNET_YES;
ph.bulk_running = GNUNET_NO;
- ph.env.sf.s_bulk_stop (ph.solver);
+ ph.sf->s_bulk_stop (ph.sf->cls);
}
else
GNUNET_break (0);
if (GNUNET_NO == ph.bulk_running)
{
ph.bulk_running = GNUNET_YES;
- ph.env.sf.s_bulk_start (ph.solver);
+ ph.sf->s_bulk_start (ph.sf->cls);
}
perf_update_all_addresses (cp + 1, ca, ph.opt_update_percent);
ph.bulk_running = GNUNET_NO;
- ph.env.sf.s_bulk_stop (ph.solver);
+ ph.sf->s_bulk_stop (ph.sf->cls);
/* Problem is solved by the solver here due to unlocking */
ph.performed_update = GNUNET_NO;
ph.expecting_solution = GNUNET_NO;
"Done, cleaning up addresses\n");
if (GNUNET_NO == ph.bulk_running)
{
- ph.env.sf.s_bulk_start (ph.solver);
+ ph.sf->s_bulk_start (ph.sf->cls);
ph.bulk_running = GNUNET_YES;
}
for (cp = 0; cp < count_p; cp++)
{
- for (cur = ph.peers[cp].head; cur != NULL ; cur = next)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Deleting addresses for peer %u\n", cp);
- GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_remove (ph.addresses,
- &ph.peers[cp].id, cur));
- ph.env.sf.s_del (ph.solver, cur, GNUNET_NO);
- next = cur->next;
- GNUNET_CONTAINER_DLL_remove(ph.peers[cp].head, ph.peers[cp].tail, cur);
- GNUNET_free_non_null (cur->atsi);
- GNUNET_free (cur);
- }
+ GNUNET_CONTAINER_multipeermap_get_multiple (ph.addresses,
+ &ph.peers[cp].id,
+ &do_delete_address,
+ NULL);
+ }
+ if (GNUNET_NO == ph.bulk_running)
+ {
+ ph.sf->s_bulk_stop (ph.sf->cls);
+ ph.bulk_running = GNUNET_NO;
}
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
char *solver;
char *plugin;
struct GNUNET_CONFIGURATION_Handle *solver_cfg;
- unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
- unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
+ unsigned long long quotas_in[GNUNET_NT_COUNT];
+ unsigned long long quotas_out[GNUNET_NT_COUNT];
int c;
int c2;
if (0 == strcmp(solver, "proportional"))
{
- ph.ats_mode = MODE_PROPORTIONAL;
ph.ats_string = "proportional";
}
else if (0 == strcmp(solver, "mlp"))
{
- ph.ats_mode = MODE_MLP;
ph.ats_string = "mlp";
}
else if ((0 == strcmp(solver, "ril")))
{
- ph.ats_mode = MODE_RIL;
ph.ats_string = "ril";
}
else
end_now (1);
return;
}
- if (GNUNET_ATS_NetworkTypeCount != load_quotas (solver_cfg,
- quotas_out, quotas_in, GNUNET_ATS_NetworkTypeCount))
+ if (GNUNET_NT_COUNT != load_quotas (solver_cfg,
+ quotas_out, quotas_in, GNUNET_NT_COUNT))
{
GNUNET_break(0);
end_now (1);
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.get_property = &get_property_cb;
- ph.env.network_count = GNUNET_ATS_NetworkTypeCount;
+ ph.env.network_count = GNUNET_NT_COUNT;
ph.env.info_cb = &solver_info_cb;
- ph.env.info_cb_cls = NULL;
- int networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
- for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
+ for (c = 0; c < GNUNET_NT_COUNT; c++)
{
- ph.env.networks[c] = networks[c];
ph.env.out_quota[c] = quotas_out[c];
ph.env.in_quota[c] = quotas_in[c];
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Loading network quotas: `%s' %llu %llu \n",
- GNUNET_ATS_print_network_type(ph.env.networks[c]),
- ph.env.out_quota[c],
- ph.env.in_quota[c]);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Loading network quotas: `%s' %llu %llu \n",
+ GNUNET_NT_to_string (c),
+ ph.env.out_quota[c],
+ ph.env.in_quota[c]);
}
- GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL );
+ GAS_normalization_start ();
+ GAS_preference_init ();
- GNUNET_asprintf (&plugin, "libgnunet_plugin_ats_%s", ph.ats_string);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Initializing solver `%s'\n"), ph.ats_string);
- if (NULL == (ph.solver = GNUNET_PLUGIN_load (plugin, &ph.env)))
+ GNUNET_asprintf (&plugin,
+ "libgnunet_plugin_ats_%s",
+ ph.ats_string);
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Initializing solver `%s'\n"),
+ ph.ats_string);
+ if (NULL == (ph.sf = GNUNET_PLUGIN_load (plugin, &ph.env)))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("Failed to initialize solver `%s'!\n"), plugin);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to initialize solver `%s'!\n"),
+ plugin);
ret = 1;
return;
}
/* Do the benchmark */
for (ph.current_iteration = 1; ph.current_iteration <= ph.total_iterations; ph.current_iteration++)
{
- fprintf (stderr, "Iteration %u of %u starting\n", ph.current_iteration, ph.total_iterations);
+ fprintf (stderr,
+ "Iteration %u of %u starting\n",
+ ph.current_iteration,
+ ph.total_iterations);
perf_run_iteration ();
evaluate (ph.current_iteration);
- fprintf (stderr, "Iteration %u of %u done\n", ph.current_iteration, ph.total_iterations);
+ fprintf (stderr,
+ "Iteration %u of %u done\n",
+ ph.current_iteration,
+ ph.total_iterations);
}
if (ph.create_datafile)
write_all_iterations ();
/* Unload solver*/
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Unloading solver `%s'\n"), ph.ats_string);
- GNUNET_PLUGIN_unload (plugin, ph.solver);
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Unloading solver `%s'\n"),
+ ph.ats_string);
+ GNUNET_PLUGIN_unload (plugin, ph.sf);
+ ph.sf = NULL;
GNUNET_free (plugin);
for (c = 0; c < ph.total_iterations; c++ )
{
GNUNET_CONFIGURATION_destroy (solver_cfg);
GNUNET_STATISTICS_destroy (ph.stat, GNUNET_NO);
- ph.solver = NULL;
}
+
/**
* Main function of the benchmark
*
ph.total_iterations = 1;
static struct GNUNET_GETOPT_CommandLineOption options[] = {
- { 'a', "addresses", NULL,
- gettext_noop ("addresses to use"),
- 1, &GNUNET_GETOPT_set_uint, &ph.N_address },
- { 's', "start", NULL,
- gettext_noop ("start with peer"),
- 1, &GNUNET_GETOPT_set_uint, &ph.N_peers_start },
- { 'e', "end", NULL,
- gettext_noop ("end with peer"),
- 1, &GNUNET_GETOPT_set_uint, &ph.N_peers_end },
- { 'i', "iterations", NULL,
- gettext_noop ("number of iterations used for averaging (default: 1)"),
- 1, &GNUNET_GETOPT_set_uint, &ph.total_iterations },
- { 'p', "percentage", NULL,
- gettext_noop ("update a fix percentage of addresses"),
- 1, &GNUNET_GETOPT_set_uint, &ph.opt_update_percent },
- { 'd', "data", NULL,
- gettext_noop ("create data file"),
- 0, &GNUNET_GETOPT_set_one, &ph.create_datafile},
- { 'u', "update", NULL,
- gettext_noop ("measure updates"),
- 0, &GNUNET_GETOPT_set_one, &ph.measure_updates},
+
+ GNUNET_GETOPT_option_uint ('a',
+ "addresses",
+ gettext_noop ("addresses to use"),
+ &ph.N_address),
+
+ GNUNET_GETOPT_option_uint ('s',
+ "start",
+ gettext_noop ("start with peer"),
+ &ph.N_peers_start),
+
+ GNUNET_GETOPT_option_uint ('e',
+ "end",
+ gettext_noop ("end with peer"),
+ &ph.N_peers_end),
+
+ GNUNET_GETOPT_option_uint ('i',
+ "iterations",
+ gettext_noop ("number of iterations used for averaging (default: 1)"),
+ &ph.total_iterations),
+
+ GNUNET_GETOPT_option_uint ('p',
+ "percentage",
+ gettext_noop ("update a fix percentage of addresses"),
+ &ph.opt_update_percent),
+
+ GNUNET_GETOPT_option_flag ('d',
+ "data",
+ gettext_noop ("create data file"),
+ &ph.create_datafile),
+
+ GNUNET_GETOPT_option_flag ('u',
+ "update",
+ gettext_noop ("measure updates"),
+ &ph.measure_updates),
+
GNUNET_GETOPT_OPTION_END
};
projects / oweals / gnunet.git / blobdiff