[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29146 - gnunet/src/ats-tests
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29146 - gnunet/src/ats-tests |
|
Date: |
Tue, 10 Sep 2013 11:20:25 +0200 |
Author: wachs
Date: 2013-09-10 11:20:25 +0200 (Tue, 10 Sep 2013)
New Revision: 29146
Added:
gnunet/src/ats-tests/perf_ats_mlp_latency.conf
gnunet/src/ats-tests/perf_ats_proportional_latency.conf
gnunet/src/ats-tests/perf_ats_ril_latency.conf
Removed:
gnunet/src/ats-tests/perf_ats_mlp_delay.conf
gnunet/src/ats-tests/perf_ats_proportional_delay.conf
gnunet/src/ats-tests/perf_ats_ril_delay.conf
Modified:
gnunet/src/ats-tests/Makefile.am
gnunet/src/ats-tests/perf_ats.c
Log:
renaming delay to latency to map to preference type
added preference usage in test
Modified: gnunet/src/ats-tests/Makefile.am
===================================================================
--- gnunet/src/ats-tests/Makefile.am 2013-09-10 09:14:18 UTC (rev 29145)
+++ gnunet/src/ats-tests/Makefile.am 2013-09-10 09:20:25 UTC (rev 29146)
@@ -14,16 +14,16 @@
if HAVE_LIBGLPK
PERF_MLP_BANDWIDTH = perf_ats_mlp_bandwidth
- PERF_MLP_DELAY = perf_ats_mlp_delay
+ PERF_MLP_LATENCY = perf_ats_mlp_latency
endif
if HAVE_TESTING
TESTING_TESTS = \
perf_ats_proportional_bandwidth \
- perf_ats_proportional_delay \
+ perf_ats_proportional_latency \
perf_ats_ril_bandwidth \
- perf_ats_ril_delay \
- $(PERF_MLP_BANDWIDTH) $(PERF_MLP_DELAY)
+ perf_ats_ril_latency \
+ $(PERF_MLP_BANDWIDTH) $(PERF_MLP_LATENCY)
endif
check_PROGRAMS = \
@@ -41,9 +41,9 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/core/libgnunetcore.la
-perf_ats_proportional_delay_SOURCES = \
+perf_ats_proportional_latency_SOURCES = \
perf_ats.c
-perf_ats_proportional_delay_LDADD = \
+perf_ats_proportional_latency_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/ats/libgnunetats.la \
@@ -58,9 +58,9 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/core/libgnunetcore.la
-perf_ats_mlp_delay_SOURCES = \
+perf_ats_mlp_latency_SOURCES = \
perf_ats.c
-perf_ats_mlp_delay_LDADD = \
+perf_ats_mlp_latency_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/ats/libgnunetats.la \
@@ -75,9 +75,9 @@
$(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/core/libgnunetcore.la
-perf_ats_ril_delay_SOURCES = \
+perf_ats_ril_latency_SOURCES = \
perf_ats.c
-perf_ats_ril_delay_LDADD = \
+perf_ats_ril_latency_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/ats/libgnunetats.la \
@@ -85,8 +85,8 @@
EXTRA_DIST = \
perf_ats_proportional_bandwidth.conf \
- perf_ats_proportional_delay.conf \
+ perf_ats_proportional_latency.conf \
perf_ats_mlp_bandwidth.conf \
- perf_ats_mlp_delay.conf \
+ perf_ats_mlp_latency.conf \
perf_ats_ril_bandwidth.conf \
- perf_ats_ril_delay.conf
+ perf_ats_ril_latency.conf
Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c 2013-09-10 09:14:18 UTC (rev 29145)
+++ gnunet/src/ats-tests/perf_ats.c 2013-09-10 09:20:25 UTC (rev 29146)
@@ -197,7 +197,8 @@
static int result;
static char *solver;
-static char *preference;
+static char *pref_str;
+static int pref_val;
/**
* Pending Responses
@@ -519,7 +520,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Set preference for master %u:
%f\n",
bp->no, last);
GNUNET_ATS_performance_change_preference (bp->p_handle,
&bp->destination->id,
- GNUNET_ATS_PREFERENCE_BANDWIDTH, (double) last,
+ pref_val, (double) last,
GNUNET_ATS_PREFERENCE_END);
last++;
bp->ats_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
@@ -1181,7 +1182,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Benchmarking solver `%s' on preference `%s' with %u master and
%u slave peers\n"),
- solver, preference, c_master_peers, c_slave_peers);
+ solver, pref_str, c_master_peers, c_slave_peers);
shutdown_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_relative_multiply(TEST_TIMEOUT, c_master_peers + c_slave_peers),
&do_shutdown, NULL);
@@ -1229,6 +1230,7 @@
char *test_name;
char *conf_name;
char *dotexe;
+ char *prefs[GNUNET_ATS_PreferenceCount] = GNUNET_ATS_PreferenceTypeString;
int c;
result = 0;
@@ -1253,11 +1255,32 @@
return GNUNET_SYSERR;
}
tmp_sep[0] = '\0';
- preference = GNUNET_strdup(tmp_sep + 1);
+ pref_str = GNUNET_strdup(tmp_sep + 1);
- GNUNET_asprintf(&conf_name, "%s%s_%s.conf", TESTNAME_PREFIX, solver,
preference);
- GNUNET_asprintf(&test_name, "%s%s_%s", TESTNAME_PREFIX, solver, preference);
+ GNUNET_asprintf(&conf_name, "%s%s_%s.conf", TESTNAME_PREFIX, solver,
pref_str);
+ GNUNET_asprintf(&test_name, "%s%s_%s", TESTNAME_PREFIX, solver, pref_str);
+ for (c = 0; c <= strlen (pref_str); c++)
+ {
+ pref_str[c] = toupper(pref_str[c]);
+ }
+ pref_val = -1;
+ for (c = 1; c < GNUNET_ATS_PreferenceCount; c++)
+ {
+ if (0 == strcmp (pref_str, prefs[c]))
+ {
+ pref_val = c;
+ break;
+ }
+ }
+ if (-1 == pref_val)
+ {
+ fprintf (stderr, "Unknown preference: `%s'\n", pref_str);
+ GNUNET_free (solver);
+ GNUNET_free (pref_str);
+ return -1;
+ }
+
for (c = 0; c < (argc -1); c++)
{
if (0 == strcmp(argv[c], "-s"))
@@ -1306,7 +1329,7 @@
&test_main, NULL);
GNUNET_free (solver);
- GNUNET_free (preference);
+ GNUNET_free (pref_str);
GNUNET_free (conf_name);
GNUNET_free (test_name);
GNUNET_free (bp_slaves);
Deleted: gnunet/src/ats-tests/perf_ats_mlp_delay.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_delay.conf 2013-09-10 09:14:18 UTC
(rev 29145)
+++ gnunet/src/ats-tests/perf_ats_mlp_delay.conf 2013-09-10 09:20:25 UTC
(rev 29146)
@@ -1,4 +0,0 @@
address@hidden@ template_perf_ats.conf
-
-[ats]
-MODE = MLP
Copied: gnunet/src/ats-tests/perf_ats_mlp_latency.conf (from rev 29144,
gnunet/src/ats-tests/perf_ats_mlp_delay.conf)
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_latency.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_mlp_latency.conf 2013-09-10 09:20:25 UTC
(rev 29146)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = MLP
Deleted: gnunet/src/ats-tests/perf_ats_proportional_delay.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_delay.conf 2013-09-10
09:14:18 UTC (rev 29145)
+++ gnunet/src/ats-tests/perf_ats_proportional_delay.conf 2013-09-10
09:20:25 UTC (rev 29146)
@@ -1,4 +0,0 @@
address@hidden@ template_perf_ats.conf
-
-[ats]
-MODE = PROPORTIONAL
Copied: gnunet/src/ats-tests/perf_ats_proportional_latency.conf (from rev
29144, gnunet/src/ats-tests/perf_ats_proportional_delay.conf)
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_latency.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_proportional_latency.conf 2013-09-10
09:20:25 UTC (rev 29146)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = PROPORTIONAL
Deleted: gnunet/src/ats-tests/perf_ats_ril_delay.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_delay.conf 2013-09-10 09:14:18 UTC
(rev 29145)
+++ gnunet/src/ats-tests/perf_ats_ril_delay.conf 2013-09-10 09:20:25 UTC
(rev 29146)
@@ -1,4 +0,0 @@
address@hidden@ template_perf_ats.conf
-
-[ats]
-MODE = RIL
Copied: gnunet/src/ats-tests/perf_ats_ril_latency.conf (from rev 29144,
gnunet/src/ats-tests/perf_ats_ril_delay.conf)
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_latency.conf
(rev 0)
+++ gnunet/src/ats-tests/perf_ats_ril_latency.conf 2013-09-10 09:20:25 UTC
(rev 29146)
@@ -0,0 +1,4 @@
address@hidden@ template_perf_ats.conf
+
+[ats]
+MODE = RIL
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29146 - gnunet/src/ats-tests,
gnunet <=