Also allow for testing of the adaptive task executor.

1 files changed, 13 insertions, 8 deletions

diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp
index aa43bfaae7d..2688a35fc6c 100644
--- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "sequencedtaskexecutor.h"
+#include "adaptive_sequenced_executor.h"
 #include "singleexecutor.h"
 #include <vespa/vespalib/util/blockingthreadstackexecutor.h>
 
@@ -16,16 +17,20 @@ constexpr uint32_t stackSize = 128 * 1024;
 std::unique_ptr<ISequencedTaskExecutor>
 SequencedTaskExecutor::create(uint32_t threads, uint32_t taskLimit, OptimizeFor optimize)
 {
-    auto executors = std::make_unique<std::vector<std::unique_ptr<vespalib::SyncableThreadExecutor>>>();
-    executors->reserve(threads);
-    for (uint32_t id = 0; id < threads; ++id) {
-        if (optimize == OptimizeFor::THROUGHPUT) {
-            executors->push_back(std::make_unique<SingleExecutor>(taskLimit));
-        } else {
-            executors->push_back(std::make_unique<BlockingThreadStackExecutor>(1, stackSize, taskLimit));
+    if (optimize == OptimizeFor::ADAPTIVE) {
+        return std::make_unique<AdaptiveSequencedExecutor>(threads, threads, taskLimit/100, 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));
+            } else {
+                executors->push_back(std::make_unique<BlockingThreadStackExecutor>(1, stackSize, taskLimit));
+            }
         }
+        return std::unique_ptr<ISequencedTaskExecutor>(new SequencedTaskExecutor(std::move(executors)));
     }
-    return std::unique_ptr<ISequencedTaskExecutor>(new SequencedTaskExecutor(std::move(executors)));
 }
 
 SequencedTaskExecutor::~SequencedTaskExecutor()