diff options
Diffstat (limited to 'staging_vespalib/src/tests')
-rw-r--r-- | staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp | 6 | ||||
-rw-r--r-- | staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp b/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp index 5fc6d2a69ae..da31f1c1a79 100644 --- a/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp +++ b/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp @@ -18,7 +18,7 @@ class Fixture public: AdaptiveSequencedExecutor _threads; - Fixture() : _threads(2, 2, 0, 1000) { } + Fixture(bool is_max_pending_hard=true) : _threads(2, 2, 0, 1000, is_max_pending_hard) { } }; @@ -231,12 +231,12 @@ TEST_F("require that executeLambda works", Fixture) } TEST("require that you get correct number of executors") { - AdaptiveSequencedExecutor seven(7, 1, 0, 10); + AdaptiveSequencedExecutor seven(7, 1, 0, 10, true); EXPECT_EQUAL(7u, seven.getNumExecutors()); } TEST("require that you distribute well") { - AdaptiveSequencedExecutor seven(7, 1, 0, 10); + AdaptiveSequencedExecutor seven(7, 1, 0, 10, true); EXPECT_EQUAL(7u, seven.getNumExecutors()); for (uint32_t id=0; id < 1000; id++) { EXPECT_EQUAL(id%7, seven.getExecutorId(id).getId()); diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp b/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp index c609c538977..0f7c82ef988 100644 --- a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp +++ b/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp @@ -55,7 +55,7 @@ int main(int argc, char **argv) { std::atomic<long> counter(0); std::unique_ptr<ISequencedTaskExecutor> executor; if (use_adaptive_executor) { - executor = std::make_unique<AdaptiveSequencedExecutor>(num_strands, num_threads, max_waiting, task_limit); + executor = std::make_unique<AdaptiveSequencedExecutor>(num_strands, num_threads, max_waiting, task_limit, true); } else { auto optimize = optimize_for_throughput ? vespalib::Executor::OptimizeFor::THROUGHPUT |