diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2014-03-04 12:19:03 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2014-03-04 12:19:03 +0000 |
commit | d386a2d3b8d9d0ee75e23c98d84e485f2bc0c647 (patch) | |
tree | a13dbd18b2efc5128bb9025f717d078846cc1c2a /src/testbed | |
parent | 5c779811684d383940d6e3766ace4bdce7bc0ae6 (diff) | |
download | gnunet-d386a2d3b8d9d0ee75e23c98d84e485f2bc0c647.tar.gz gnunet-d386a2d3b8d9d0ee75e23c98d84e485f2bc0c647.zip |
- increase history size for the measured average operation execution times.
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/testbed_api_operations.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index f9f36df75..b0ddf5f8d 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * The number of readings containing past operation's timing information that we | 33 | * The number of readings containing past operation's timing information that we |
34 | * keep track of for adaptive queues | 34 | * keep track of for adaptive queues |
35 | */ | 35 | */ |
36 | #define ADAPTIVE_QUEUE_DEFAULT_HISTORY 10 | 36 | #define ADAPTIVE_QUEUE_DEFAULT_HISTORY 40 |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * The number of parallel opeartions we start with by default for adaptive | 39 | * The number of parallel opeartions we start with by default for adaptive |
@@ -908,6 +908,7 @@ adapt_parallelism (struct OperationQueue *queue) | |||
908 | adaptive_queue_set_max_active (queue, queue->max_active); /* no change */ | 908 | adaptive_queue_set_max_active (queue, queue->max_active); /* no change */ |
909 | return; | 909 | return; |
910 | } | 910 | } |
911 | |||
911 | parallelism = 0; | 912 | parallelism = 0; |
912 | if (-1 == sd) | 913 | if (-1 == sd) |
913 | parallelism = queue->max_active + 1; | 914 | parallelism = queue->max_active + 1; |
@@ -920,11 +921,12 @@ adapt_parallelism (struct OperationQueue *queue) | |||
920 | parallelism = GNUNET_MAX (parallelism, ADAPTIVE_QUEUE_DEFAULT_MAX_ACTIVE); | 921 | parallelism = GNUNET_MAX (parallelism, ADAPTIVE_QUEUE_DEFAULT_MAX_ACTIVE); |
921 | adaptive_queue_set_max_active (queue, parallelism); | 922 | adaptive_queue_set_max_active (queue, parallelism); |
922 | 923 | ||
923 | #if 0 /* old algorithm */ | 924 | #if 0 |
925 | /* old algorithm */ | ||
924 | if (sd < 0) | 926 | if (sd < 0) |
925 | sd = 0; | 927 | sd = 0; |
926 | GNUNET_assert (0 <= sd); | 928 | GNUNET_assert (0 <= sd); |
927 | GNUNET_TESTBED_SD_add_data_ (fctx->sd, (unsigned int) avg.rel_value_us); | 929 | //GNUNET_TESTBED_SD_add_data_ (fctx->sd, (unsigned int) avg.rel_value_us); |
928 | if (0 == sd) | 930 | if (0 == sd) |
929 | { | 931 | { |
930 | adaptive_queue_set_max_active (queue, queue->max_active * 2); | 932 | adaptive_queue_set_max_active (queue, queue->max_active * 2); |