[GNUnet-SVN] r35516 - gnunet/src/ats-tests

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35516 - gnunet/src/ats-tests

From:	gnunet
Subject:	[GNUnet-SVN] r35516 - gnunet/src/ats-tests
Date:	Thu, 9 Apr 2015 13:01:28 +0200
Author: wachs
Date: 2015-04-09 13:01:28 +0200 (Thu, 09 Apr 2015)
New Revision: 35516

Modified:
   gnunet/src/ats-tests/gnunet_ats_sim_default.conf
   gnunet/src/ats-tests/perf_ats.c
   gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf
   gnunet/src/ats-tests/perf_ats_mlp_latency.conf
   gnunet/src/ats-tests/perf_ats_mlp_none.conf
   gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf
   gnunet/src/ats-tests/perf_ats_proportional_latency.conf
   gnunet/src/ats-tests/perf_ats_proportional_none.conf
   gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf
   gnunet/src/ats-tests/perf_ats_ril_latency.conf
   gnunet/src/ats-tests/perf_ats_ril_none.conf
Log:
adding new ATS struct, updating config files to use lower case solver names


Modified: gnunet/src/ats-tests/gnunet_ats_sim_default.conf
===================================================================
--- gnunet/src/ats-tests/gnunet_ats_sim_default.conf    2015-04-09 11:00:31 UTC 
(rev 35515)
+++ gnunet/src/ats-tests/gnunet_ats_sim_default.conf    2015-04-09 11:01:28 UTC 
(rev 35516)
@@ -3,4 +3,4 @@
 plugins = unix
 
 [ats]
-MODE = PROPORTIONAL
+MODE = proportional

Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2015-04-09 11:00:31 UTC (rev 35515)
+++ gnunet/src/ats-tests/perf_ats.c     2015-04-09 11:01:28 UTC (rev 35516)
@@ -320,11 +320,10 @@
 log_request_cb (void *cls, const struct GNUNET_HELLO_Address *address,
     int address_active, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
-    const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+    const struct GNUNET_ATS_Properties *ats)
 {
   struct BenchmarkPeer *me = cls;
   struct BenchmarkPartner *p;
-  int c_a;
   char *peer_id;
 
   p = find_partner (me, &address->peer);
@@ -342,15 +341,11 @@
   p->bandwidth_in = ntohl (bandwidth_in.value__);
   p->bandwidth_out = ntohl (bandwidth_out.value__);
 
-  for (c_a = 0; c_a < ats_count; c_a++)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s [%u] received ATS information: %s 
%s %u\n",
-        (GNUNET_YES == p->me->master) ? "Master" : "Slave",
-        p->me->no,
-        GNUNET_i2s (&p->dest->id),
-        GNUNET_ATS_print_property_type(ntohl(ats[c_a].type)),
-        ntohl(ats[c_a].value));
-  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s [%u] received ATS information for 
peers `%s'\n",
+      (GNUNET_YES == p->me->master) ? "Master" : "Slave",
+          p->me->no,
+          GNUNET_i2s (&p->dest->id));
+
   GNUNET_free(peer_id);
   if (NULL != l)
     GNUNET_ATS_TEST_logging_now (l);
@@ -374,17 +369,27 @@
 
   result = 0;
 
-  /* figure out testname */
+  /* Determine testname
+   * perf_ats_<solver>_<transport>_<preference>[.exe]*/
+
+  /* Find test prefix, store in temp */
   tmp = strstr (argv[0], TESTNAME_PREFIX);
   if (NULL == tmp)
   {
     fprintf (stderr, "Unable to parse test name `%s'\n", argv[0]);
     return GNUNET_SYSERR;
   }
+
+  /* Set tmp to end of test name prefix */
   tmp += strlen (TESTNAME_PREFIX);
+
+  /* Determine solver name */
   solver = GNUNET_strdup (tmp);
+  /* Remove .exe prefix */
   if (NULL != (dotexe = strstr (solver, ".exe")) && dotexe[4] == '\0')
     dotexe[0] = '\0';
+
+  /* Determine first '_' after solver */
   tmp_sep = strchr (solver, '_');
   if (NULL == tmp_sep)
   {

Modified: gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf    2015-04-09 11:00:31 UTC 
(rev 35515)
+++ gnunet/src/ats-tests/perf_ats_mlp_bandwidth.conf    2015-04-09 11:01:28 UTC 
(rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = MLP
\ No newline at end of file
+MODE = mlp

Modified: gnunet/src/ats-tests/perf_ats_mlp_latency.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_latency.conf      2015-04-09 11:00:31 UTC 
(rev 35515)
+++ gnunet/src/ats-tests/perf_ats_mlp_latency.conf      2015-04-09 11:01:28 UTC 
(rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = MLP
+MODE = mlp

Modified: gnunet/src/ats-tests/perf_ats_mlp_none.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_mlp_none.conf 2015-04-09 11:00:31 UTC (rev 
35515)
+++ gnunet/src/ats-tests/perf_ats_mlp_none.conf 2015-04-09 11:01:28 UTC (rev 
35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = MLP
\ No newline at end of file
+MODE = mlp

Modified: gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf   2015-04-09 
11:00:31 UTC (rev 35515)
+++ gnunet/src/ats-tests/perf_ats_proportional_bandwidth.conf   2015-04-09 
11:01:28 UTC (rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = PROPORTIONAL
+MODE = proportional

Modified: gnunet/src/ats-tests/perf_ats_proportional_latency.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_latency.conf     2015-04-09 
11:00:31 UTC (rev 35515)
+++ gnunet/src/ats-tests/perf_ats_proportional_latency.conf     2015-04-09 
11:01:28 UTC (rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = PROPORTIONAL
+MODE = proportional

Modified: gnunet/src/ats-tests/perf_ats_proportional_none.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_proportional_none.conf        2015-04-09 
11:00:31 UTC (rev 35515)
+++ gnunet/src/ats-tests/perf_ats_proportional_none.conf        2015-04-09 
11:01:28 UTC (rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = PROPORTIONAL
+MODE = proportional

Modified: gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf    2015-04-09 11:00:31 UTC 
(rev 35515)
+++ gnunet/src/ats-tests/perf_ats_ril_bandwidth.conf    2015-04-09 11:01:28 UTC 
(rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = RIL
\ No newline at end of file
+MODE = ril

Modified: gnunet/src/ats-tests/perf_ats_ril_latency.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_latency.conf      2015-04-09 11:00:31 UTC 
(rev 35515)
+++ gnunet/src/ats-tests/perf_ats_ril_latency.conf      2015-04-09 11:01:28 UTC 
(rev 35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = RIL
+MODE = ril

Modified: gnunet/src/ats-tests/perf_ats_ril_none.conf
===================================================================
--- gnunet/src/ats-tests/perf_ats_ril_none.conf 2015-04-09 11:00:31 UTC (rev 
35515)
+++ gnunet/src/ats-tests/perf_ats_ril_none.conf 2015-04-09 11:01:28 UTC (rev 
35516)
@@ -1,4 +1,4 @@
 @INLINE@ template_perf_ats.conf
 
 [ats]
-MODE = RIL
\ No newline at end of file
+MODE = ril
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r35516 - gnunet/src/ats-tests, gnunet <=
Prev by Date: [GNUnet-SVN] r35515 - gnunet/src/include
Next by Date: [GNUnet-SVN] r35517 - gnunet/src/include
Previous by thread: [GNUnet-SVN] r35515 - gnunet/src/include
Next by thread: [GNUnet-SVN] r35517 - gnunet/src/include
Index(es):
- Date
- Thread