[GNUnet-SVN] r13537 - gnunet/src/core

[gnunet]

Author: wachs
Date: 2010-11-03 18:58:48 +0100 (Wed, 03 Nov 2010)
New Revision: 13537

Modified:
   gnunet/src/core/test_core_quota_compliance.c
Log:


Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c        2010-11-03 17:30:50 UTC 
(rev 13536)
+++ gnunet/src/core/test_core_quota_compliance.c        2010-11-03 17:58:48 UTC 
(rev 13537)
@@ -47,7 +47,7 @@
  */
 #define TOTAL_MSGS (600 * 10)
 
-#define MEASUREMENT_MSG_SIZE 1024
+#define MEASUREMENT_MSG_SIZE 10240
 #define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024
 #define MEASUREMENT_MIN_QUOTA 1024
 #define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10)
@@ -231,10 +231,10 @@
          duration = GNUNET_TIME_absolute_get_difference(start_time, 
GNUNET_TIME_absolute_get());
          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                          "\nQuota compliance: \n"\
-                         "Received %llu \n"
-                         "Throughput: %10llu kB/s\n"\
-                         "Quota     : %10llu kB/s\n",
-                         total_bytes_recv,
+                         "Receive rate: %10llu kB/s\n"
+                         "Send rate   : %10llu kB/s\n"\
+                         "Quota       : %10llu kB/s\n",
+                         (total_bytes_recv/(duration.rel_value / 1000)/1024),
                          (total_bytes_sent/(duration.rel_value / 
1000)/1024),current_quota_p1_in/1024);
 
          if (err_task != GNUNET_SCHEDULER_NO_TASK)
@@ -396,7 +396,7 @@
 
   total_bytes += ret;
   total_bytes_sent += ret;
-  send_task = GNUNET_SCHEDULER_add_delayed (sched, 
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500), &send_tsk, 
NULL);
+  send_task = GNUNET_SCHEDULER_add_delayed (sched, 
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100), &send_tsk, 
NULL);
 
   return ret;
 }