Merge pull request #25281 from vespa-engine/balder/just-your-own-thread

Now all threads have a fixed stack and there is no use in creating an…

1 files changed, 11 insertions, 15 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
index 0cc70d7fa6a..7492cd45857 100644
--- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
+++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
@@ -297,21 +297,17 @@ BlueprintResolver::compile()
 {
     assert(_executorSpecs.empty()); // only one compilation allowed
     Compiler compiler(_factory, _indexEnv, _executorSpecs, _featureMap);
-    auto compile_task = makeLambdaTask([&]() {
-                                   compiler.probe_stack();
-                                   for (const auto &seed: _seeds) {
-                                       auto ref = compiler.resolve_feature(seed, Blueprint::AcceptInput::ANY);
-                                       if (compiler.failed()) {
-                                           _warnings = std::move(compiler.errors);
-                                           return;
-                                       }
-                                       _seedMap.emplace(FeatureNameParser(seed).featureName(), ref);
-                                   }
-                               });
-    ThreadStackExecutor executor(1, 8_Mi);
-    executor.execute(std::move(compile_task));
-    executor.sync();
-    executor.shutdown();
+
+    compiler.probe_stack();
+    for (const auto &seed: _seeds) {
+       auto ref = compiler.resolve_feature(seed, Blueprint::AcceptInput::ANY);
+       if (compiler.failed()) {
+           _warnings = std::move(compiler.errors);
+           break;
+       }
+       _seedMap.emplace(FeatureNameParser(seed).featureName(), ref);
+    }
+
     size_t stack_usage = compiler.stack_usage();
     if (stack_usage > (128_Ki)) {
         _warnings.emplace_back(fmt("high stack usage: %zu bytes", stack_usage));