From 06a8585e58111223b6e1c19e8c24066714c51b89 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 9 Dec 2021 19:40:00 +0000 Subject: _executor -> _thread --- config/src/vespa/config/helper/configfetcher.cpp | 9 ++++----- config/src/vespa/config/retriever/simpleconfigurer.cpp | 4 ++-- slobrok/src/vespa/slobrok/server/slobrokserver.cpp | 9 +++------ .../tests/persistence/filestorage/operationabortingtest.cpp | 4 ++-- vbench/src/apps/vbench/vbench.cpp | 4 ++-- vbench/src/tests/dispatcher/dispatcher_test.cpp | 8 ++++---- vbench/src/tests/handler_thread/handler_thread_test.cpp | 4 ++-- vbench/src/vbench/vbench/request_scheduler.cpp | 10 +++++----- vbench/src/vbench/vbench/worker.cpp | 4 ++-- vespalib/src/tests/thread/thread_test.cpp | 8 ++++---- 10 files changed, 30 insertions(+), 34 deletions(-) diff --git a/config/src/vespa/config/helper/configfetcher.cpp b/config/src/vespa/config/helper/configfetcher.cpp index 0ac3492c97f..d85308bbcbb 100644 --- a/config/src/vespa/config/helper/configfetcher.cpp +++ b/config/src/vespa/config/helper/configfetcher.cpp @@ -9,12 +9,11 @@ LOG_SETUP(".config.helper.configfetcher"); namespace config { -VESPA_THREAD_STACK_TAG(config_fetcher_executor); +VESPA_THREAD_STACK_TAG(config_fetcher_thread); - - ConfigFetcher::ConfigFetcher(const IConfigContext::SP & context) +ConfigFetcher::ConfigFetcher(const IConfigContext::SP & context) : _poller(context), - _thread(std::make_unique(_poller, config_fetcher_executor)), + _thread(std::make_unique(_poller, config_fetcher_thread)), _closed(false), _started(false) { @@ -22,7 +21,7 @@ VESPA_THREAD_STACK_TAG(config_fetcher_executor); ConfigFetcher::ConfigFetcher(const SourceSpec & spec) : _poller(std::make_shared(spec)), - _thread(std::make_unique(_poller, config_fetcher_executor)), + _thread(std::make_unique(_poller, config_fetcher_thread)), _closed(false), _started(false) { diff --git a/config/src/vespa/config/retriever/simpleconfigurer.cpp b/config/src/vespa/config/retriever/simpleconfigurer.cpp index 9d6a6f752c3..5059b9997f5 100644 --- a/config/src/vespa/config/retriever/simpleconfigurer.cpp +++ b/config/src/vespa/config/retriever/simpleconfigurer.cpp @@ -8,12 +8,12 @@ LOG_SETUP(".config.retriever.simpleconfigurer"); namespace config { -VESPA_THREAD_STACK_TAG(simple_configurer_executor); +VESPA_THREAD_STACK_TAG(simple_configurer_thread); SimpleConfigurer::SimpleConfigurer(SimpleConfigRetriever::UP retriever, SimpleConfigurable * const configurable) : _retriever(std::move(retriever)), _configurable(configurable), - _thread(*this, simple_configurer_executor), + _thread(*this, simple_configurer_thread), _started(false) { assert(_retriever); diff --git a/slobrok/src/vespa/slobrok/server/slobrokserver.cpp b/slobrok/src/vespa/slobrok/server/slobrokserver.cpp index 4223bedcf3f..5601336fdfd 100644 --- a/slobrok/src/vespa/slobrok/server/slobrokserver.cpp +++ b/slobrok/src/vespa/slobrok/server/slobrokserver.cpp @@ -2,23 +2,20 @@ #include "slobrokserver.h" -#include -LOG_SETUP(".slobrok.server"); - namespace slobrok { -VESPA_THREAD_STACK_TAG(slobrok_server_executor); +VESPA_THREAD_STACK_TAG(slobrok_server_thread); SlobrokServer::SlobrokServer(ConfigShim &shim) : _env(shim), - _thread(*this, slobrok_server_executor) + _thread(*this, slobrok_server_thread) { _thread.start(); } SlobrokServer::SlobrokServer(uint32_t port) : _env(ConfigShim(port)), - _thread(*this, slobrok_server_executor) + _thread(*this, slobrok_server_thread) { _thread.start(); } diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp index ffd7d804663..1752de5fb80 100644 --- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp +++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp @@ -22,7 +22,7 @@ namespace storage { namespace { -VESPA_THREAD_STACK_TAG(test_executor); +VESPA_THREAD_STACK_TAG(test_thread); // Exploit the fact that PersistenceProviderWrapper already provides a forwarding // implementation of all SPI calls, so we can selectively override. @@ -296,7 +296,7 @@ TEST_F(OperationAbortingTest, wait_for_current_operation_completion_for_aborted_ auto abortCmd = makeAbortCmd(abortSet); SendTask sendTask(abortCmd, *_queueBarrier, c.top); - vespalib::Thread thread(sendTask, test_executor); + vespalib::Thread thread(sendTask, test_thread); thread.start(); LOG(debug, "waiting for threads to reach barriers"); diff --git a/vbench/src/apps/vbench/vbench.cpp b/vbench/src/apps/vbench/vbench.cpp index d37ed7688de..edaa68b8838 100644 --- a/vbench/src/apps/vbench/vbench.cpp +++ b/vbench/src/apps/vbench/vbench.cpp @@ -8,7 +8,7 @@ using namespace vbench; -VESPA_THREAD_STACK_TAG(vbench_executor); +VESPA_THREAD_STACK_TAG(vbench_thread); typedef vespalib::SignalHandler SIG; @@ -44,7 +44,7 @@ int run(const std::string &cfg_name) { VBench vbench(cfg); NotifyDone notify(done); vespalib::RunnablePair runBoth(vbench, notify); - vespalib::Thread thread(runBoth, vbench_executor); + vespalib::Thread thread(runBoth, vbench_thread); thread.start(); while (!SIG::INT.check() && !SIG::TERM.check() && !done.await(1s)) {} if (!done.await(vespalib::duration::zero())) { diff --git a/vbench/src/tests/dispatcher/dispatcher_test.cpp b/vbench/src/tests/dispatcher/dispatcher_test.cpp index 99b57669120..618940aab57 100644 --- a/vbench/src/tests/dispatcher/dispatcher_test.cpp +++ b/vbench/src/tests/dispatcher/dispatcher_test.cpp @@ -17,8 +17,8 @@ struct Fetcher : public vespalib::Runnable { void run() override { handler.handle(provider.provide()); } }; -VESPA_THREAD_STACK_TAG(fetcher1_executor); -VESPA_THREAD_STACK_TAG(fetcher2_executor); +VESPA_THREAD_STACK_TAG(fetcher1_thread); +VESPA_THREAD_STACK_TAG(fetcher2_thread); TEST("dispatcher") { MyHandler dropped; @@ -27,8 +27,8 @@ TEST("dispatcher") { Dispatcher dispatcher(dropped); Fetcher fetcher1(dispatcher, handler1); Fetcher fetcher2(dispatcher, handler2); - vespalib::Thread thread1(fetcher1, fetcher1_executor); - vespalib::Thread thread2(fetcher2, fetcher2_executor); + vespalib::Thread thread1(fetcher1, fetcher1_thread); + vespalib::Thread thread2(fetcher2, fetcher2_thread); thread1.start(); EXPECT_TRUE(dispatcher.waitForThreads(1, 512)); thread2.start(); diff --git a/vbench/src/tests/handler_thread/handler_thread_test.cpp b/vbench/src/tests/handler_thread/handler_thread_test.cpp index 6b5dbedd0ac..97a12e82ac8 100644 --- a/vbench/src/tests/handler_thread/handler_thread_test.cpp +++ b/vbench/src/tests/handler_thread/handler_thread_test.cpp @@ -15,11 +15,11 @@ struct MyHandler : Handler { MyHandler::~MyHandler() = default; -VESPA_THREAD_STACK_TAG(test_executor); +VESPA_THREAD_STACK_TAG(test_thread); TEST("handler thread") { MyHandler handler; - HandlerThread th(handler, test_executor); + HandlerThread th(handler, test_thread); th.handle(std::unique_ptr(new int(1))); th.handle(std::unique_ptr(new int(2))); th.handle(std::unique_ptr(new int(3))); diff --git a/vbench/src/vbench/vbench/request_scheduler.cpp b/vbench/src/vbench/vbench/request_scheduler.cpp index 320ecc91fc6..95d29181b1f 100644 --- a/vbench/src/vbench/vbench/request_scheduler.cpp +++ b/vbench/src/vbench/vbench/request_scheduler.cpp @@ -5,8 +5,8 @@ namespace vbench { -VESPA_THREAD_STACK_TAG(vbench_request_scheduler_executor); -VESPA_THREAD_STACK_TAG(vbench_handler_executor); +VESPA_THREAD_STACK_TAG(vbench_request_scheduler_thread); +VESPA_THREAD_STACK_TAG(vbench_handler_thread); void RequestScheduler::run() @@ -26,16 +26,16 @@ RequestScheduler::run() RequestScheduler::RequestScheduler(CryptoEngine::SP crypto, Handler &next, size_t numWorkers) : _timer(), - _proxy(next, vbench_handler_executor), + _proxy(next, vbench_handler_thread), _queue(10.0, 0.020), _droppedTagger(_proxy), _dispatcher(_droppedTagger), - _thread(*this, vbench_request_scheduler_executor), + _thread(*this, vbench_request_scheduler_thread), _connectionPool(std::move(crypto), _timer), _workers() { for (size_t i = 0; i < numWorkers; ++i) { - _workers.push_back(std::unique_ptr(new Worker(_dispatcher, _proxy, _connectionPool, _timer))); + _workers.push_back(std::make_unique(_dispatcher, _proxy, _connectionPool, _timer)); } _dispatcher.waitForThreads(numWorkers, 256); } diff --git a/vbench/src/vbench/vbench/worker.cpp b/vbench/src/vbench/vbench/worker.cpp index 08f788ea3e9..afccc7de39f 100644 --- a/vbench/src/vbench/vbench/worker.cpp +++ b/vbench/src/vbench/vbench/worker.cpp @@ -5,7 +5,7 @@ namespace vbench { -VESPA_THREAD_STACK_TAG(vbench_worker_executor); +VESPA_THREAD_STACK_TAG(vbench_worker_thread); void Worker::run() @@ -24,7 +24,7 @@ Worker::run() Worker::Worker(Provider &provider, Handler &next, HttpConnectionPool &pool, Timer &timer) - : _thread(*this, vbench_worker_executor), + : _thread(*this, vbench_worker_thread), _provider(provider), _next(next), _pool(pool), diff --git a/vespalib/src/tests/thread/thread_test.cpp b/vespalib/src/tests/thread/thread_test.cpp index 38abf810354..ee4f97c34cc 100644 --- a/vespalib/src/tests/thread/thread_test.cpp +++ b/vespalib/src/tests/thread/thread_test.cpp @@ -6,7 +6,7 @@ using namespace vespalib; -VESPA_THREAD_STACK_TAG(test_agent_executor); +VESPA_THREAD_STACK_TAG(test_agent_thread); struct Agent : public Runnable { bool started; @@ -24,7 +24,7 @@ struct Agent : public Runnable { TEST("thread never started") { Agent agent; { - Thread thread(agent, test_agent_executor); + Thread thread(agent, test_agent_thread); } EXPECT_TRUE(!agent.started); EXPECT_EQUAL(0, agent.loopCnt); @@ -33,7 +33,7 @@ TEST("thread never started") { TEST("normal operation") { Agent agent; { - Thread thread(agent, test_agent_executor); + Thread thread(agent, test_agent_thread); thread.start(); std::this_thread::sleep_for(20ms); thread.stop().join(); @@ -45,7 +45,7 @@ TEST("normal operation") { TEST("stop before start") { Agent agent; { - Thread thread(agent, test_agent_executor); + Thread thread(agent, test_agent_thread); thread.stop(); thread.start(); thread.join(); -- cgit v1.2.3