From 06a8585e58111223b6e1c19e8c24066714c51b89 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 9 Dec 2021 19:40:00 +0000
Subject: _executor -> _thread

---
 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 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'vbench')

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<int> 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<int> {
 
 MyHandler::~MyHandler() = default;
 
-VESPA_THREAD_STACK_TAG(test_executor);
+VESPA_THREAD_STACK_TAG(test_thread);
 
 TEST("handler thread") {
     MyHandler handler;
-    HandlerThread<int> th(handler, test_executor);
+    HandlerThread<int> th(handler, test_thread);
     th.handle(std::unique_ptr<int>(new int(1)));
     th.handle(std::unique_ptr<int>(new int(2)));
     th.handle(std::unique_ptr<int>(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<Request> &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<Worker>(new Worker(_dispatcher, _proxy, _connectionPool, _timer)));
+        _workers.push_back(std::make_unique<Worker>(_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<Request> &provider, Handler<Request> &next,
                HttpConnectionPool &pool, Timer &timer)
-    : _thread(*this, vbench_worker_executor),
+    : _thread(*this, vbench_worker_thread),
       _provider(provider),
       _next(next),
       _pool(pool),
-- 
cgit v1.2.3