Name the threads so it is easier to see who is doing what.

5 files changed, 25 insertions, 14 deletions

diff --git a/searchlib/src/apps/tests/memoryindexstress_test.cpp b/searchlib/src/apps/tests/memoryindexstress_test.cpp
index 041335b7ed1..3f848b45cc3 100644
--- a/searchlib/src/apps/tests/memoryindexstress_test.cpp
+++ b/searchlib/src/apps/tests/memoryindexstress_test.cpp
@@ -242,13 +242,15 @@ private:
     Fixture &operator=(Fixture &&index) = delete;
 };
 
+VESPA_THREAD_STACK_TAG(invert_executor)
+VESPA_THREAD_STACK_TAG(push_executor)
 
 Fixture::Fixture(uint32_t readThreads)
     : schema(makeSchema()),
       repo(makeDocTypeRepoConfig()),
       _executor(1, 128 * 1024),
-      _invertThreads(vespalib::SequencedTaskExecutor::create(2)),
-      _pushThreads(vespalib::SequencedTaskExecutor::create(2)),
+      _invertThreads(vespalib::SequencedTaskExecutor::create(invert_executor, 2)),
+      _pushThreads(vespalib::SequencedTaskExecutor::create(push_executor, 2)),
       index(schema, MockFieldLengthInspector(), *_invertThreads, *_pushThreads),
       _readThreads(readThreads),
       _writer(1, 128 * 1024),
diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index c2fd048ce3e..c94d19cb3b7 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -279,6 +279,8 @@ validateDiskIndex(DiskIndex &dw, bool f2HasElements, bool f3HasWeights)
     }
 }
 
+VESPA_THREAD_STACK_TAG(invert_executor)
+VESPA_THREAD_STACK_TAG(push_executor)
 
 void
 FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool directio, bool readmmap)
@@ -315,8 +317,8 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire
                                addField("f4"));
     FieldIndexCollection fic(schema, MockFieldLengthInspector());
     DocBuilder b(schema);
-    auto invertThreads = SequencedTaskExecutor::create(2);
-    auto pushThreads = SequencedTaskExecutor::create(2);
+    auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2);
+    auto pushThreads = SequencedTaskExecutor::create(push_executor, 2);
     DocumentInverter inv(schema, *invertThreads, *pushThreads, fic);
     Document::UP doc;
 
@@ -456,8 +458,8 @@ FusionTest::make_simple_index(const vespalib::string &dump_dir, const IFieldLeng
     uint32_t numDocs = 20;
     uint32_t numWords = 1000;
     DocBuilder b(_schema);
-    auto invertThreads = SequencedTaskExecutor::create(2);
-    auto pushThreads = SequencedTaskExecutor::create(2);
+    auto invertThreads = SequencedTaskExecutor::create(invert_executor, 2);
+    auto pushThreads = SequencedTaskExecutor::create(push_executor, 2);
     DocumentInverter inv(_schema, *invertThreads, *pushThreads, fic);
 
     inv.invertDocument(10, *make_doc10(b));
diff --git a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp
index 58f800dec23..0a3a40ec0e7 100644
--- a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp
+++ b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp
@@ -116,6 +116,8 @@ public:
     }
 };
 
+VESPA_THREAD_STACK_TAG(invert_executor)
+VESPA_THREAD_STACK_TAG(push_executor)
 
 struct DocumentInverterTest : public ::testing::Test {
     Schema _schema;
@@ -141,8 +143,8 @@ struct DocumentInverterTest : public ::testing::Test {
     DocumentInverterTest()
         : _schema(makeSchema()),
           _b(_schema),
-          _invertThreads(SequencedTaskExecutor::create(2)),
-          _pushThreads(SequencedTaskExecutor::create(2)),
+          _invertThreads(SequencedTaskExecutor::create(invert_executor, 2)),
+          _pushThreads(SequencedTaskExecutor::create(push_executor, 2)),
           _word_store(),
           _remover(_word_store),
           _inserter(),
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index ee42d68a495..d7b515c29e0 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -901,6 +901,8 @@ TEST_F(FieldIndexCollectionTypeTest, instantiates_field_index_type_based_on_sche
     expect_field_index_type<FieldIndex<true>>(fic.getFieldIndex(1));
 }
 
+VESPA_THREAD_STACK_TAG(invert_executor)
+VESPA_THREAD_STACK_TAG(push_executor)
 
 class InverterTest : public ::testing::Test {
 public:
@@ -915,8 +917,8 @@ public:
         : _schema(schema),
           _fic(_schema, MockFieldLengthInspector()),
           _b(_schema),
-          _invertThreads(SequencedTaskExecutor::create(2)),
-          _pushThreads(SequencedTaskExecutor::create(2)),
+          _invertThreads(SequencedTaskExecutor::create(invert_executor, 2)),
+          _pushThreads(SequencedTaskExecutor::create(push_executor, 2)),
           _inv(_schema, *_invertThreads, *_pushThreads, _fic)
     {
     }
@@ -1449,14 +1451,15 @@ TEST_F(FieldIndexCollectionTest, require_that_insert_tells_which_word_ref_that_w
     insertAndAssertTuple("c", 2, 22, fic);
 }
 
+
 struct RemoverTest : public FieldIndexCollectionTest {
     std::unique_ptr<ISequencedTaskExecutor> _invertThreads;
     std::unique_ptr<ISequencedTaskExecutor> _pushThreads;
 
     RemoverTest()
         : FieldIndexCollectionTest(),
-          _invertThreads(SequencedTaskExecutor::create(2)),
-          _pushThreads(SequencedTaskExecutor::create(2))
+          _invertThreads(SequencedTaskExecutor::create(invert_executor, 2)),
+          _pushThreads(SequencedTaskExecutor::create(push_executor, 2))
     {
     }
     void assertPostingLists(const vespalib::string &e1,
diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
index 6476ac7cf8a..6bbaf16380d 100644
--- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
@@ -121,12 +121,14 @@ private:
     Index &operator=(const Index &index);
 };
 
+VESPA_THREAD_STACK_TAG(invert_executor)
+VESPA_THREAD_STACK_TAG(push_executor)
 
 Index::Index(const MySetup &setup)
     : schema(setup.schema),
       _executor(1, 128 * 1024),
-      _invertThreads(SequencedTaskExecutor::create(2)),
-      _pushThreads(SequencedTaskExecutor::create(2)),
+      _invertThreads(SequencedTaskExecutor::create(invert_executor, 2)),
+      _pushThreads(SequencedTaskExecutor::create(push_executor, 2)),
       index(schema, setup, *_invertThreads, *_pushThreads),
       builder(schema),
       docid(1),