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

[gnunet]

Author: wachs
Date: 2014-02-03 23:54:18 +0100 (Mon, 03 Feb 2014)
New Revision: 32179

Modified:
   gnunet/src/ats-tests/ats-testing-log.c
   gnunet/src/ats-tests/ats-testing-preferences.c
   gnunet/src/ats-tests/ats-testing.h
Log:
preference logging


Modified: gnunet/src/ats-tests/ats-testing-log.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-log.c      2014-02-03 22:51:27 UTC (rev 
32178)
+++ gnunet/src/ats-tests/ats-testing-log.c      2014-02-03 22:54:18 UTC (rev 
32179)
@@ -140,6 +140,9 @@
   uint32_t ats_cost_lan;
 
   uint32_t ats_cost_wlan;
+
+  double pref_bandwidth;
+  double pref_delay;
 };
 
 
@@ -492,7 +495,8 @@
       /* Header */
       GNUNET_asprintf (&data, "# master %u; slave %u ; experiment : %s\n"
           "timestamp; timestamp delta; #messages sent; #bytes sent; 
#throughput sent; #messages received; #bytes received; #throughput received; " \
-          "rtt; bw in; bw out; ats_cost_lan; ats_cost_wlan; ats_delay; 
ats_distance; ats_network_type; ats_utilization_up ;ats_utilization_down\n" ,
+          "rtt; bw in; bw out; ats_cost_lan; ats_cost_wlan; ats_delay; 
ats_distance; ats_network_type; ats_utilization_up ;ats_utilization_down;" \
+          "pref bandwidth; pref delay\n",
           c_m, c_s, experiment_name);
       if (GNUNET_SYSERR == GNUNET_DISK_file_write(f[c_s], data, strlen(data)))
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -541,7 +545,7 @@
 
         /* Assembling slave string */
         GNUNET_asprintf(&data,
-            
"%llu;%llu;%u;%u;%u;%u;%u;%u;%.3f;%u;%u;%u;%u;%u;%u;%u;%u;%u;%u;\n",
+            
"%llu;%llu;%u;%u;%u;%u;%u;%u;%.3f;%u;%u;%u;%u;%u;%u;%u;%u;%u;%u;%.3f;%.3f\n",
             (long long unsigned int) cur_lt->timestamp.abs_value_us,
             (long long unsigned int) 
GNUNET_TIME_absolute_get_difference(l->lp[c_m].start,
                 cur_lt->timestamp).rel_value_us / 1000,
@@ -561,7 +565,9 @@
             plt->ats_distance,
             plt->ats_network_type,
             plt->ats_utilization_up,
-            plt->ats_utilization_down);
+            plt->ats_utilization_down,
+            plt->pref_bandwidth,
+            plt->pref_delay);
 
         if (l->verbose)
           fprintf (stderr,
@@ -743,6 +749,8 @@
       slt->ats_utilization_up = p->ats_utilization_up;
       slt->bandwidth_in = p->bandwidth_in;
       slt->bandwidth_out = p->bandwidth_out;
+      slt->pref_bandwidth = p->pref_bandwidth;
+      slt->pref_delay = p->pref_delay;
 
       /* Total application level rtt  */
       if (NULL == prev_log_mlt)

Modified: gnunet/src/ats-tests/ats-testing-preferences.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-preferences.c      2014-02-03 22:51:27 UTC 
(rev 32178)
+++ gnunet/src/ats-tests/ats-testing-preferences.c      2014-02-03 22:54:18 UTC 
(rev 32179)
@@ -108,6 +108,17 @@
   GNUNET_ATS_performance_change_preference(p->me->ats_perf_handle,
       &p->dest->id, p->pg->kind, pref_value, GNUNET_ATS_PREFERENCE_END);
 
+  switch (p->pg->kind) {
+    case GNUNET_ATS_PREFERENCE_BANDWIDTH:
+      p->pref_bandwidth = pref_value;
+      break;
+    case GNUNET_ATS_PREFERENCE_LATENCY:
+      p->pref_delay = pref_value;
+      break;
+    default:
+      break;
+  }
+
   p->pg->set_task = GNUNET_SCHEDULER_add_delayed (p->pg->frequency,
       set_pref_task, p);
 

Modified: gnunet/src/ats-tests/ats-testing.h
===================================================================
--- gnunet/src/ats-tests/ats-testing.h  2014-02-03 22:51:27 UTC (rev 32178)
+++ gnunet/src/ats-tests/ats-testing.h  2014-02-03 22:54:18 UTC (rev 32179)
@@ -339,6 +339,9 @@
   uint32_t ats_cost_lan;
 
   uint32_t ats_cost_wlan;
+
+  double pref_bandwidth;
+  double pref_delay;
 };
 
 /**