[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30581 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30581 - gnunet/src/ats |
Date: |
Wed, 6 Nov 2013 23:33:59 +0100 |
Author: wachs
Date: 2013-11-06 23:33:59 +0100 (Wed, 06 Nov 2013)
New Revision: 30581
Added:
gnunet/src/ats/perf_ats_solver.conf
Modified:
gnunet/src/ats/Makefile.am
gnunet/src/ats/perf_ats_solver.c
Log:
new config for solver
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2013-11-06 21:06:17 UTC (rev 30580)
+++ gnunet/src/ats/Makefile.am 2013-11-06 22:33:59 UTC (rev 30581)
@@ -471,4 +471,5 @@
test_ats_solver_ril.conf \
perf_ats_solver_mlp.conf \
perf_ats_solver_proportional.conf \
- perf_ats_solver_ril.conf
+ perf_ats_solver_ril.conf \
+ perf_ats_solver.conf
Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c 2013-11-06 21:06:17 UTC (rev 30580)
+++ gnunet/src/ats/perf_ats_solver.c 2013-11-06 22:33:59 UTC (rev 30581)
@@ -830,7 +830,7 @@
{
cur_addr = perf_create_address (cp, ca);
/* Add address */
- ph.env.sf.s_add (ph.solver, cur_addr, GNUNET_ATS_NET_LAN);
+ ph.env.sf.s_add (ph.solver, cur_addr, GNUNET_ATS_NET_LOOPBACK);
ph.current_a = ca + 1;
perf_address_initial_update (ph.solver, ph.addresses, cur_addr);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -917,6 +917,7 @@
char *test_filename = cls;
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];
int c;
@@ -985,7 +986,15 @@
ph.opt_update_percent = DEFAULT_UPDATE_PERCENTAGE;
/* Load quotas */
- if (GNUNET_ATS_NetworkTypeCount != load_quotas (cfg,
+ solver_cfg = GNUNET_CONFIGURATION_create();
+ GNUNET_CONFIGURATION_load ( solver_cfg, "perf_ats_solver.conf");
+ if (NULL == solver_cfg)
+ {
+ GNUNET_break(0);
+ end_now (1);
+ return;
+ }
+ if (GNUNET_ATS_NetworkTypeCount != load_quotas (solver_cfg,
quotas_out, quotas_in, GNUNET_ATS_NetworkTypeCount))
{
GNUNET_break(0);
@@ -994,7 +1003,7 @@
}
/* Load solver */
- ph.env.cfg = cfg;
+ ph.env.cfg = solver_cfg;
ph.stat = GNUNET_STATISTICS_create ("ats", cfg);
ph.env.stats = ph.stat;
ph.addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
@@ -1035,6 +1044,7 @@
GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Unloading solver `%s'\n"),
ph.ats_string);
GNUNET_PLUGIN_unload (plugin, ph.solver);
GNUNET_free (plugin);
+ GNUNET_CONFIGURATION_destroy (solver_cfg);
ph.solver = NULL;
}
Added: gnunet/src/ats/perf_ats_solver.conf
===================================================================
--- gnunet/src/ats/perf_ats_solver.conf (rev 0)
+++ gnunet/src/ats/perf_ats_solver.conf 2013-11-06 22:33:59 UTC (rev 30581)
@@ -0,0 +1,19 @@
+[ats]
+# Network specific inbound/outbound quotas
+UNSPECIFIED_QUOTA_IN = unlimited
+UNSPECIFIED_QUOTA_OUT = unlimited
+# LOOPBACK
+LOOPBACK_QUOTA_IN = unlimited
+LOOPBACK_QUOTA_OUT = unlimited
+# LAN
+LAN_QUOTA_IN = unlimited
+LAN_QUOTA_OUT = unlimited
+# WAN
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited
+# WLAN
+WLAN_QUOTA_IN = unlimited
+WLAN_QUOTA_OUT = unlimited
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = unlimited
+BLUETOOTH_QUOTA_OUT = unlimited
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30581 - gnunet/src/ats,
gnunet <=