Merge pull request #32208 from vespa-engine/toregge/define-thread-loc…

…al-blueprint-options-in-a-single-compilation-unit Define thread local blueprint options in a single compilation unit.
vespa-engine · Aug 21, 2024 · 6b7c9d2 · 6b7c9d2
2 parents dd3ece9 + a57b410
commit 6b7c9d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
@@ -50,6 +50,8 @@ void maybe_eliminate_self(Blueprint* &self, Blueprint::UP replacement) {
 
 //-----------------------------------------------------------------------------
 
+thread_local Blueprint::Options Blueprint::_opts;
+
 Blueprint::HitEstimate
 Blueprint::max(const std::vector<HitEstimate> &data)
 {

diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.h b/searchlib/src/vespa/searchlib/queryeval/blueprint.h
@@ -85,8 +85,7 @@ class Blueprint
 
 private:
     static Options &thread_opts() noexcept {
-        thread_local Options opts;
-        return opts;
+        return _opts;
     }
     struct BindOpts {
         Options prev;
@@ -244,6 +243,7 @@ class Blueprint
     uint32_t   _id;
     bool       _strict;
     bool       _frozen;
+    thread_local static Options _opts;
 
 protected:
     virtual void notifyChange() {