From d9b3da8cd2b65fc8399399e6beb9dcb5dc2fc7ad Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 4 Feb 2019 19:19:03 +0000 Subject: Name the threads --- searchcore/src/vespa/searchcore/proton/server/proton.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index ecfca857bd5..6f398a0e75d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -100,6 +100,11 @@ deriveCompactionCompressionThreads(const ProtonConfig &proton, const vespalib::string CUSTOM_COMPONENT_API_PATH = "/state/v1/custom/component"; +VESPA_THREAD_STACK_TAG(proton_shared_executor) +VESPA_THREAD_STACK_TAG(index_warmup_executor) +VESPA_THREAD_STACK_TAG(initialize_executor) +VESPA_THREAD_STACK_TAG(close_executor) + } Proton::ProtonFileHeaderContext::ProtonFileHeaderContext(const Proton &proton_, const vespalib::string &creator) @@ -287,13 +292,13 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) protonConfig.visit.ignoremaxbytes); vespalib::string fileConfigId; - _warmupExecutor = std::make_unique(4, 128*1024); + _warmupExecutor = std::make_unique(4, 128*1024, index_warmup_executor); const size_t sharedThreads = deriveCompactionCompressionThreads(protonConfig, hwInfo.cpu()); - _sharedExecutor = std::make_unique(sharedThreads, 128*1024, sharedThreads*16); + _sharedExecutor = std::make_unique(sharedThreads, 128*1024, sharedThreads*16, proton_shared_executor); InitializeThreads initializeThreads; if (protonConfig.initialize.threads > 0) { - initializeThreads = std::make_shared(protonConfig.initialize.threads, 128 * 1024); + initializeThreads = std::make_shared(protonConfig.initialize.threads, 128 * 1024, initialize_executor); _initDocumentDbsInSequence = (protonConfig.initialize.threads == 1); } _protonConfigurer.applyInitialConfig(initializeThreads); @@ -434,7 +439,7 @@ Proton::~Proton() _fs4Server->shutDown(); } size_t numCores = _protonConfigurer.getActiveConfigSnapshot()->getBootstrapConfig()->getHwInfo().cpu().cores(); - vespalib::ThreadStackExecutor closePool(std::min(_documentDBMap.size(), numCores), 0x20000); + vespalib::ThreadStackExecutor closePool(std::min(_documentDBMap.size(), numCores), 0x20000, close_executor); closeDocumentDBs(closePool); _documentDBMap.clear(); _persistenceEngine.reset(); -- cgit v1.2.3