diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-06 07:38:18 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-06 07:38:18 +0000 |
commit | 2de5ae18d40b44ececc0898dbe5b1003590de680 (patch) | |
tree | d1fed29ebdc8041fb7880ae3ad3efd6e8999b129 /staging_vespalib/src | |
parent | a4132d1d8bc228bad9de8e986a777fa1e9e6939d (diff) |
Fix merge conflict after revert.
Diffstat (limited to 'staging_vespalib/src')
-rw-r--r-- | staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp index 2688a35fc6c..6d42895bffc 100644 --- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp @@ -18,13 +18,13 @@ std::unique_ptr<ISequencedTaskExecutor> SequencedTaskExecutor::create(uint32_t threads, uint32_t taskLimit, OptimizeFor optimize) { if (optimize == OptimizeFor::ADAPTIVE) { - return std::make_unique<AdaptiveSequencedExecutor>(threads, threads, taskLimit/100, taskLimit); + return std::make_unique<AdaptiveSequencedExecutor>(threads, threads, 0, taskLimit); } else { auto executors = std::make_unique<std::vector<std::unique_ptr<SyncableThreadExecutor>>>(); executors->reserve(threads); for (uint32_t id = 0; id < threads; ++id) { if (optimize == OptimizeFor::THROUGHPUT) { - executors->push_back(std::make_unique<SingleExecutor>(taskLimit, taskLimit/100, 1ms)); + executors->push_back(std::make_unique<SingleExecutor>(taskLimit)); } else { executors->push_back(std::make_unique<BlockingThreadStackExecutor>(1, stackSize, taskLimit)); } |