diff options
8 files changed, 16 insertions, 16 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp b/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp index e87f74e2258..9f6bd140e54 100644 --- a/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp +++ b/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp @@ -34,6 +34,7 @@ IndexManagerInitializer(const vespalib::string &baseDir, { } +IndexManagerInitializer::~IndexManagerInitializer() = default; void IndexManagerInitializer::run() diff --git a/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.h b/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.h index 8e446e222b3..c3f01ed8420 100644 --- a/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.h +++ b/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.h @@ -38,6 +38,7 @@ public: const search::TuneFileAttributes & tuneFileAttributes, const search::common::FileHeaderContext & fileHeaderContext, std::shared_ptr<searchcorespi::IIndexManager::SP> indexManager); + ~IndexManagerInitializer() override; void run() override; }; diff --git a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h index 7cf25292d1c..f74b9074a44 100644 --- a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h +++ b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h @@ -77,7 +77,7 @@ public: const search::TuneFileIndexManager &tuneFileIndexManager, const search::TuneFileAttributes &tuneFileAttributes, const search::common::FileHeaderContext &fileHeaderContext); - ~IndexManager(); + ~IndexManager() override; searchcorespi::index::IndexMaintainer &getMaintainer() { return _maintainer; diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp b/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp index bbb87099988..81734f681fd 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp @@ -4,12 +4,11 @@ #include <vespa/vespalib/data/slime/cursor.h> #include <vespa/vespalib/util/blockingthreadstackexecutor.h> #include <vespa/vespalib/util/singleexecutor.h> -#include <vespa/vespalib/util/threadexecutor.h> #include <vespa/vespalib/util/threadstackexecutor.h> using vespalib::BlockingThreadStackExecutor; using vespalib::SingleExecutor; -using vespalib::SyncableThreadExecutor; +using vespalib::ThreadExecutor; using vespalib::ThreadStackExecutor; using vespalib::slime::Cursor; @@ -19,7 +18,7 @@ namespace proton::explorer { namespace { void -convert_syncable_executor_to_slime(const SyncableThreadExecutor& executor, const vespalib::string& type, Cursor& object) +convert_syncable_executor_to_slime(const ThreadExecutor& executor, const vespalib::string& type, Cursor& object) { object.setString("type", type); object.setLong("num_threads", executor.getNumThreads()); @@ -37,7 +36,7 @@ convert_single_executor_to_slime(const SingleExecutor& executor, Cursor& object) } void -convert_executor_to_slime(const SyncableThreadExecutor* executor, Cursor& object) +convert_executor_to_slime(const ThreadExecutor* executor, Cursor& object) { if (executor == nullptr) { return; @@ -49,7 +48,7 @@ convert_executor_to_slime(const SyncableThreadExecutor* executor, Cursor& object } else if (const auto* thread = dynamic_cast<const ThreadStackExecutor*>(executor)) { convert_syncable_executor_to_slime(*thread, "ThreadStackExecutor", object); } else { - convert_syncable_executor_to_slime(*executor, "SyncableThreadExecutor", object); + convert_syncable_executor_to_slime(*executor, "ThreadExecutor", object); } } diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.h b/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.h index 0793fa6ac4a..6bf70ef4889 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.h +++ b/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.h @@ -2,7 +2,7 @@ #pragma once -namespace vespalib { class SyncableThreadExecutor; } +namespace vespalib { class ThreadExecutor; } namespace vespalib::slime { struct Cursor; } namespace proton::explorer { @@ -10,7 +10,7 @@ namespace proton::explorer { /** * Utility to convert an executor to slime for use with a state explorer. */ -void convert_executor_to_slime(const vespalib::SyncableThreadExecutor* executor, vespalib::slime::Cursor& object); +void convert_executor_to_slime(const vespalib::ThreadExecutor* executor, vespalib::slime::Cursor& object); } diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp index 80c1288903e..ab1642bdc2a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp @@ -7,7 +7,6 @@ #include <vespa/vespalib/util/singleexecutor.h> #include <vespa/vespalib/util/blockingthreadstackexecutor.h> - using vespalib::SyncableThreadExecutor; using vespalib::BlockingThreadStackExecutor; using vespalib::SingleExecutor; @@ -37,11 +36,11 @@ VESPA_THREAD_STACK_TAG(attribute_executor) } -ExecutorThreadingService::ExecutorThreadingService(vespalib::SyncableThreadExecutor &sharedExecutor, uint32_t num_treads) +ExecutorThreadingService::ExecutorThreadingService(vespalib::ThreadExecutor &sharedExecutor, uint32_t num_treads) : ExecutorThreadingService(sharedExecutor, ThreadingServiceConfig::make(num_treads)) {} -ExecutorThreadingService::ExecutorThreadingService(vespalib::SyncableThreadExecutor & sharedExecutor, +ExecutorThreadingService::ExecutorThreadingService(vespalib::ThreadExecutor & sharedExecutor, const ThreadingServiceConfig & cfg, uint32_t stackSize) : _sharedExecutor(sharedExecutor), diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h index 1561f5d6adc..96316ad5364 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h +++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h @@ -17,7 +17,7 @@ class ThreadingServiceConfig; class ExecutorThreadingService : public searchcorespi::index::IThreadingService { private: - vespalib::SyncableThreadExecutor & _sharedExecutor; + vespalib::ThreadExecutor & _sharedExecutor; vespalib::ThreadStackExecutor _masterExecutor; std::unique_ptr<vespalib::SyncableThreadExecutor> _indexExecutor; std::unique_ptr<vespalib::SyncableThreadExecutor> _summaryExecutor; @@ -37,9 +37,9 @@ public: * @stackSize The size of the stack of the underlying executors. * @cfg config used to set up all executors. */ - ExecutorThreadingService(vespalib::SyncableThreadExecutor &sharedExecutor, + ExecutorThreadingService(vespalib::ThreadExecutor &sharedExecutor, const ThreadingServiceConfig & cfg, uint32_t stackSize = 128 * 1024); - ExecutorThreadingService(vespalib::SyncableThreadExecutor &sharedExecutor, uint32_t num_treads = 1); + ExecutorThreadingService(vespalib::ThreadExecutor &sharedExecutor, uint32_t num_treads = 1); ~ExecutorThreadingService() override; /** @@ -75,7 +75,7 @@ public: searchcorespi::index::IThreadService &summary() override { return _summaryService; } - vespalib::SyncableThreadExecutor &shared() override { + vespalib::ThreadExecutor &shared() override { return _sharedExecutor; } diff --git a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h b/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h index 18c376a4c2b..5b16c6f9235 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h +++ b/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h @@ -59,7 +59,7 @@ struct IThreadingService : public vespalib::Syncable IThreadingService(const IThreadingService &) = delete; IThreadingService & operator = (const IThreadingService &) = delete; IThreadingService() = default; - virtual ~IThreadingService() {} + virtual ~IThreadingService() = default; virtual IThreadService &master() = 0; virtual IThreadService &index() = 0; |