diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-11-03 17:58:48 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-11-03 17:58:48 +0000 |
commit | 151027edb372c17c35a79ae3be3f932a1e150190 (patch) | |
tree | ad8e33ee9c3281272102635ee37089a8f4ce89c1 /src/core/test_core_quota_compliance.c | |
parent | 261274f4c1081bee8b2b77a8efe8423e1e0c9a3b (diff) | |
download | gnunet-151027edb372c17c35a79ae3be3f932a1e150190.tar.gz gnunet-151027edb372c17c35a79ae3be3f932a1e150190.zip |
Diffstat (limited to 'src/core/test_core_quota_compliance.c')
-rw-r--r-- | src/core/test_core_quota_compliance.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 9bc0e9e38..d4df96611 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -47,7 +47,7 @@ | |||
47 | */ | 47 | */ |
48 | #define TOTAL_MSGS (600 * 10) | 48 | #define TOTAL_MSGS (600 * 10) |
49 | 49 | ||
50 | #define MEASUREMENT_MSG_SIZE 1024 | 50 | #define MEASUREMENT_MSG_SIZE 10240 |
51 | #define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024 | 51 | #define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024 |
52 | #define MEASUREMENT_MIN_QUOTA 1024 | 52 | #define MEASUREMENT_MIN_QUOTA 1024 |
53 | #define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) | 53 | #define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) |
@@ -231,10 +231,10 @@ measurement_end (void *cls, | |||
231 | duration = GNUNET_TIME_absolute_get_difference(start_time, GNUNET_TIME_absolute_get()); | 231 | duration = GNUNET_TIME_absolute_get_difference(start_time, GNUNET_TIME_absolute_get()); |
232 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 232 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
233 | "\nQuota compliance: \n"\ | 233 | "\nQuota compliance: \n"\ |
234 | "Received %llu \n" | 234 | "Receive rate: %10llu kB/s\n" |
235 | "Throughput: %10llu kB/s\n"\ | 235 | "Send rate : %10llu kB/s\n"\ |
236 | "Quota : %10llu kB/s\n", | 236 | "Quota : %10llu kB/s\n", |
237 | total_bytes_recv, | 237 | (total_bytes_recv/(duration.rel_value / 1000)/1024), |
238 | (total_bytes_sent/(duration.rel_value / 1000)/1024),current_quota_p1_in/1024); | 238 | (total_bytes_sent/(duration.rel_value / 1000)/1024),current_quota_p1_in/1024); |
239 | 239 | ||
240 | if (err_task != GNUNET_SCHEDULER_NO_TASK) | 240 | if (err_task != GNUNET_SCHEDULER_NO_TASK) |
@@ -396,7 +396,7 @@ transmit_ready (void *cls, size_t size, void *buf) | |||
396 | 396 | ||
397 | total_bytes += ret; | 397 | total_bytes += ret; |
398 | total_bytes_sent += ret; | 398 | total_bytes_sent += ret; |
399 | send_task = GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500), &send_tsk, NULL); | 399 | send_task = GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100), &send_tsk, NULL); |
400 | 400 | ||
401 | return ret; | 401 | return ret; |
402 | } | 402 | } |