aboutsummaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-12-06 17:23:48 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-12-06 17:47:53 +0000
commit30827a4c8ed38be228f26b590a67eab6321ec76e (patch)
treedf48dd20e87b6d2046006aa65d296d8689d0ab75 /staging_vespalib
parent2c01393b7cb5c7ab6d76ff300cbd38ac6ac747e9 (diff)
Round up to a power of 2 AFTER you have capped tasklimit.
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
index a2962c6ea84..2ebc64cf62a 100644
--- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
@@ -75,7 +75,7 @@ SingleExecutor::execute(Task::UP task) {
void
SingleExecutor::setTaskLimit(uint32_t taskLimit) {
- _wantedTaskLimit = std::max(vespalib::roundUp2inN(taskLimit), size_t(_watermark));
+ _wantedTaskLimit = vespalib::roundUp2inN(std::max(taskLimit, _watermark));
}
void