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

[gnunet]

Author: wachs
Date: 2014-01-22 13:15:15 +0100 (Wed, 22 Jan 2014)
New Revision: 32002

Modified:
   gnunet/src/ats-tests/perf_ats.c
Log:
fix for evaluation


Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2014-01-22 11:47:05 UTC (rev 32001)
+++ gnunet/src/ats-tests/perf_ats.c     2014-01-22 12:15:15 UTC (rev 32002)
@@ -150,6 +150,9 @@
     {
       p = &mp->partners[c_s];
 
+      fprintf (stderr , "%u  %u %u\n", p->bytes_sent, (p->bytes_sent / 1024) / 
duration, duration);
+      fprintf (stderr , "%u %u %u \n", p->bytes_received, (p->bytes_sent / 
1024) / duration, duration);
+
       kb_sent_sec = 0;
       kb_recv_sec = 0;
       kb_sent_percent = 0.0;
@@ -158,15 +161,19 @@
 
       if (duration > 0)
       {
-         kb_sent_percent = (p->bytes_sent / 1024) / duration;
-         kb_recv_percent = (p->bytes_received / 1024) / duration;
+         kb_sent_sec = (p->bytes_sent / 1024) / duration;
+         kb_recv_sec = (p->bytes_received / 1024) / duration;
       }
+
       if (mp->total_bytes_sent > 0)
          kb_sent_percent = ((double) p->bytes_sent * 100) / 
mp->total_bytes_sent;
       if (mp->total_bytes_received > 0)
          kb_recv_percent = ((double) p->bytes_received * 100) / 
mp->total_bytes_received;
       if (1000 * p->messages_sent > 0)
          rtt = p->total_app_rtt / (1000 * p->messages_sent);
+
+
+
       fprintf (stderr,
           "%c Master [%u] -> Slave [%u]: sent %u KiB/s (%.2f %%), received %u 
KiB/s (%.2f %%)\n",
           (mp->pref_partner == p->dest) ? '*' : ' ',
@@ -232,7 +239,7 @@
     return 0;
   }
 
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Master [%u]: Sending PING to [%u]\n",
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Master [%u]: Sending PING to [%u]\n",
       p->me->no, p->dest->no);
 
   p->messages_sent++;
@@ -391,7 +398,7 @@
     return GNUNET_SYSERR;
   }
 
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
       "Slave [%u]: Received PING from [%u], sending PONG\n", me->no,
       p->dest->no);
 
@@ -430,7 +437,7 @@
     return GNUNET_SYSERR;
   }
 
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
       "Master [%u]: Received PONG from [%u], next message\n", me->no,
       p->dest->no);