aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_quota_compliance.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-10-28 13:25:33 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-10-28 13:25:33 +0000
commit265502fad2304198e401ace40f1b2f7798784aa0 (patch)
tree30776ebe96788a4ec34e5454760a8b939d20c2d6 /src/transport/test_quota_compliance.c
parent1d61fd46780c3c2d05bcdfdfbf8969cff5f50d84 (diff)
downloadgnunet-265502fad2304198e401ace40f1b2f7798784aa0.tar.gz
gnunet-265502fad2304198e401ace40f1b2f7798784aa0.zip
Diffstat (limited to 'src/transport/test_quota_compliance.c')
-rw-r--r--src/transport/test_quota_compliance.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index a5a836d48..c01fc8474 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -52,9 +52,8 @@
52#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) 52#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
53#define MEASUREMENT_MSG_SIZE 10000 53#define MEASUREMENT_MSG_SIZE 10000
54#define MEASUREMENT_MSG_SIZE_BIG 32768 54#define MEASUREMENT_MSG_SIZE_BIG 32768
55#define MEASUREMENT_MAX_QUOTA 50000 55#define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024
56/*#define MEASUREMENT_MAX_QUOTA 1000000*/ 56#define MEASUREMENT_MIN_QUOTA 1024 * 10
57#define MEASUREMENT_MIN_QUOTA 1000
58#define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) 57#define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
59/** 58/**
60 * Testcase timeout 59 * Testcase timeout
@@ -370,7 +369,7 @@ measurement_end (void *cls,
370 "Quota allowed: %10llu kB/s\n"\ 369 "Quota allowed: %10llu kB/s\n"\
371 "Throughput : %10llu kB/s\n", (current_quota_p1 / (1024)) , (total_bytes/(duration.rel_value / 1000)/1024)); 370 "Throughput : %10llu kB/s\n", (current_quota_p1 / (1024)) , (total_bytes/(duration.rel_value / 1000)/1024));
372 ok = 1; 371 ok = 1;
373 //end(); 372 end();
374 return; 373 return;
375 } 374 }
376 else 375 else
@@ -386,7 +385,7 @@ measurement_end (void *cls,
386 end(); 385 end();
387 else 386 else
388 387
389 measure (current_quota_p1- 1000, current_quota_p2- 1000); 388 measure (current_quota_p1 / 1024, current_quota_p2 / 1024);
390} 389}
391 390
392static void measure (unsigned long long quota_p1, unsigned long long quota_p2 ) 391static void measure (unsigned long long quota_p1, unsigned long long quota_p2 )
@@ -395,7 +394,7 @@ static void measure (unsigned long long quota_p1, unsigned long long quota_p2 )
395 current_quota_p2 = quota_p2; 394 current_quota_p2 = quota_p2;
396#if VERBOSE 395#if VERBOSE
397 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 396 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
398 "Starting transport level measurement: Duration: %u Quota: %llu\n", MEASUREMENT_INTERVALL, current_quota_p1); 397 "Starting transport level measurement for %u and quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p1 / 1024);
399#endif 398#endif
400 GNUNET_TRANSPORT_set_quota (p1.th, 399 GNUNET_TRANSPORT_set_quota (p1.th,
401 &p2.id, 400 &p2.id,