[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32295 - in gnunet/src/ats: . experiments
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32295 - in gnunet/src/ats: . experiments |
Date: |
Tue, 11 Feb 2014 11:30:35 +0100 |
Author: wachs
Date: 2014-02-11 11:30:35 +0100 (Tue, 11 Feb 2014)
New Revision: 32295
Modified:
gnunet/src/ats/experiments/example.exp
gnunet/src/ats/experiments/gnunet_ats_sim_default.conf
gnunet/src/ats/gnunet-ats-solver-eval.c
Log:
improved quota loading + requesting and stopping address suggestions
Modified: gnunet/src/ats/experiments/example.exp
===================================================================
--- gnunet/src/ats/experiments/example.exp 2014-02-11 10:20:20 UTC (rev
32294)
+++ gnunet/src/ats/experiments/example.exp 2014-02-11 10:30:35 UTC (rev
32295)
@@ -4,7 +4,7 @@
slaves = 2
max_duration = 15 s
log_freq = 1000 ms
- cfg_file = gnunet_ats_sim_default.conf
+ cfg_file = experiments/gnunet_ats_sim_default.conf
[episode-0]
# operations = address_add, address_del, start_set_property,
stop_set_property,
@@ -60,10 +60,10 @@
op-1-peer-id = 1
op-1-pref = BANDWIDTH
-op-2-operation = stop_set_property
-op-2-address-id = 0
-op-2-peer-id = 0
-op-2-property = UTILIZATION_UP
+#op-2-operation = stop_set_property
+#op-2-address-id = 0
+#op-2-peer-id = 0
+#op-2-property = UTILIZATION_UP
-op-3-operation = stop_request
-op-3-peer-id = 0
\ No newline at end of file
+op-2-operation = stop_request
+op-2-peer-id = 0
\ No newline at end of file
Modified: gnunet/src/ats/experiments/gnunet_ats_sim_default.conf
===================================================================
--- gnunet/src/ats/experiments/gnunet_ats_sim_default.conf 2014-02-11
10:20:20 UTC (rev 32294)
+++ gnunet/src/ats/experiments/gnunet_ats_sim_default.conf 2014-02-11
10:30:35 UTC (rev 32295)
@@ -1,6 +1,18 @@
address@hidden@ template_perf_ats.conf
-[transport]
-plugins = unix
-
[ats]
-MODE = PROPORTIONAL
+UNSPECIFIED_QUOTA_IN = 64 KiB
+UNSPECIFIED_QUOTA_OUT = 64 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = 64 KiB
+LOOPBACK_QUOTA_OUT = 64 KiB
+# LAN
+LAN_QUOTA_IN = 64 KiB
+LAN_QUOTA_OUT = 64 KiB
+# WAN
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+# WLAN
+WLAN_QUOTA_IN = 64 KiB
+WLAN_QUOTA_OUT = 64 KiB
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = 64 KiB
+BLUETOOTH_QUOTA_OUT = 64 KiB
Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c 2014-02-11 10:20:20 UTC (rev
32294)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c 2014-02-11 10:30:35 UTC (rev
32295)
@@ -1905,15 +1905,45 @@
static void
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_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Requesting address for unknown peer %u\n", op->peer_id);
+ return;
+ }
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting address for peer %u\n",
op->peer_id);
+
+ res = sh->env.sf.s_get (sh->solver, &p->peer_id);
+ if (NULL != res)
+ {
+
+ }
+
}
static void
enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op)
{
+ struct TestPeer *p;
+
+ if (NULL == (p = find_peer_by_id (op->peer_id)))
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Requesting address for unknown peer %u\n", op->peer_id);
+ return;
+ }
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop requesting address for peer %u\n",
op->peer_id);
+
+ sh->env.sf.s_get_stop (sh->solver, &p->peer_id);
}
static void enforce_episode (struct Episode *ep)
@@ -2092,7 +2122,7 @@
}
else
{
- fprintf (stderr, "Experiment name: `%s'\n", e->cfg_file);
+ fprintf (stderr, "Experiment configuration: `%s'\n", e->cfg_file);
e->cfg = GNUNET_CONFIGURATION_create();
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (e->cfg, e->cfg_file))
{
@@ -2276,7 +2306,7 @@
network_str[c], GNUNET_ATS_DefaultBandwidth);
out_dest[c] = GNUNET_ATS_DefaultBandwidth;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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", network_str[c], in_dest[c], out_dest[c]);
GNUNET_free (entry_out);
GNUNET_free (entry_in);
}
@@ -2384,9 +2414,14 @@
{
if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
(0 == ntohl (address->assigned_bw_in.value__)) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Solver notified to disconnect peer `%s'\n",
+ GNUNET_i2s (&address->peer));
return;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
GNUNET_i2s (&address->peer),
address,
@@ -2423,8 +2458,6 @@
{
struct SolverHandle *sh;
char * solver_str;
- unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
- unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
switch (type) {
case GNUNET_ATS_SOLVER_PROPORTIONAL:
@@ -2445,10 +2478,11 @@
sh = GNUNET_new (struct SolverHandle);
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 = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+ 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;
@@ -2456,12 +2490,13 @@
sh->env.info_cb = &solver_info_cb;
sh->env.info_cb_cls = NULL;
+
/* start normalization */
GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL );
/* load quotas */
if (GNUNET_ATS_NetworkTypeCount != GNUNET_ATS_solvers_load_quotas (e->cfg,
- quotas_out, quotas_in, GNUNET_ATS_NetworkTypeCount))
+ sh->env.out_quota, sh->env.in_quota, GNUNET_ATS_NetworkTypeCount))
{
GNUNET_break(0);
GNUNET_free (sh->plugin);
@@ -2480,9 +2515,6 @@
end_now ();
return NULL;
}
-
- sh->addresses = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
-
return sh;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32295 - in gnunet/src/ats: . experiments,
gnunet <=