From 4b90f418a469ac72fadd890a021069eb7b9a365c Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 2 Nov 2010 10:11:00 +0000 Subject: new: increasing quotas --- src/transport/test_quota_compliance.c | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index d7f549b2d..1e0a1ad42 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -45,8 +45,8 @@ #define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) #define MEASUREMENT_MSG_SIZE 10000 #define MEASUREMENT_MSG_SIZE_BIG 32768 -#define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024 -#define MEASUREMENT_MIN_QUOTA 1024 * 10 +#define MEASUREMENT_MAX_QUOTA 10000 +#define MEASUREMENT_MIN_QUOTA 1024 #define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 35) /** * Testcase timeout @@ -394,7 +394,6 @@ measurement_end (void *cls, } else { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\nQuota compliance ok: \n"\ "Quota allowed: %10llu kB/s\n"\ @@ -402,19 +401,31 @@ measurement_end (void *cls, ok = 0; } - if (quota_allowed < MEASUREMENT_MIN_QUOTA) + if (quota_allowed == MEASUREMENT_MAX_QUOTA) { end(); return; } + if (is_asymmetric_send_constant == GNUNET_YES) + { + if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA) + measure (current_quota_p1 * 2, MEASUREMENT_MAX_QUOTA); + else + measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA); + } + else if (is_asymmetric_recv_constant == GNUNET_YES) + { + if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA) + measure (MEASUREMENT_MAX_QUOTA, current_quota_p2 * 2); + else + measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA); + } else { - if (is_asymmetric_send_constant == GNUNET_YES) - measure (current_quota_p1 / 10, MEASUREMENT_MAX_QUOTA); - else if (is_asymmetric_recv_constant == GNUNET_YES) - measure (MEASUREMENT_MAX_QUOTA, current_quota_p2 / 10); + if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA) + measure ((current_quota_p1) * 2, (current_quota_p2) * 2); else - measure (current_quota_p1 / 10, current_quota_p2 / 10); + measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA); } } @@ -496,7 +507,12 @@ notify_connect (void *cls, } if (connected == 2) { - measure(MEASUREMENT_MAX_QUOTA,MEASUREMENT_MAX_QUOTA); + if (is_asymmetric_send_constant == GNUNET_YES) + measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MAX_QUOTA); + else if (is_asymmetric_recv_constant == GNUNET_YES) + measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MIN_QUOTA); + else + measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MIN_QUOTA); } } -- cgit v1.2.3