MB-36956: Move CB3ExecutorThread to own files

Move the CB3ExecutorThread class from executorthread.{cc,h} to it's
own cb3_executorthread.{cc,h} files.

Change-Id: I7871ae8cafc1861a650a86a85315c718c39f11b6
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/133514
Tested-by: Build Bot <[email protected]>
Reviewed-by: Jim Walker <[email protected]>

Author: daverigby

engines/ep/CMakeLists.txt

@@ -237,6 +237,7 @@ ADD_LIBRARY(ep_objs OBJECT
             src/bucket_logger.cc
             src/callbacks.cc
             src/cb3_executorpool.cc
+            src/cb3_executorthread.cc
             src/checkpoint.cc
             src/checkpoint_config.cc
             src/checkpoint_manager.cc
@@ -293,7 +294,6 @@ ADD_LIBRARY(ep_objs OBJECT
             src/ephemeral_vb_count_visitor.cc
             src/environment.cc
             src/executorpool.cc
-            src/executorthread.cc
             src/ext_meta_parser.cc
             src/failover-table.cc
             src/flusher.cc

engines/ep/src/bgfetcher.cc

@@ -17,9 +17,9 @@
 
 #include "bgfetcher.h"
 #include "bucket_logger.h"
+#include "cb3_executorthread.h"
 #include "ep_engine.h"
 #include "executorpool.h"
-#include "executorthread.h"
 #include "kv_bucket.h"
 #include "kvshard.h"
 #include "tasks.h"

engines/ep/src/cb3_executorpool.cc

@@ -17,9 +17,9 @@
 
 #include "cb3_executorpool.h"
 #include "bucket_logger.h"
+#include "cb3_executorthread.h"
 #include "ep_engine.h"
 #include "ep_time.h"
-#include "executorthread.h"
 #include "statistics/collector.h"
 #include "taskqueue.h"
 

engines/ep/src/executorthread.cc renamed to engines/ep/src/cb3_executorthread.cc

@@ -15,7 +15,7 @@
  *   limitations under the License.
  */
 
-#include "executorthread.h"
+#include "cb3_executorthread.h"
 #include "bucket_logger.h"
 #include "cb3_executorpool.h"
 #include "globaltask.h"
@@ -29,10 +29,10 @@
 #include <sstream>
 
 extern "C" {
-    static void launch_executor_thread(void *arg) {
-        auto* executor = (CB3ExecutorThread*)arg;
-        executor->run();
-    }
+static void launch_executor_thread(void* arg) {
+    auto* executor = (CB3ExecutorThread*)arg;
+    executor->run();
+}
 }
 
 CB3ExecutorThread::~CB3ExecutorThread() {
@@ -48,7 +48,10 @@ void CB3ExecutorThread::start() {
         thread_name.replace(pos, worker.size(), "");
     }
     thread_name.resize(15);
-    if (cb_create_named_thread(&thread, launch_executor_thread, this, 0,
+    if (cb_create_named_thread(&thread,
+                               launch_executor_thread,
+                               this,
+                               0,
                                thread_name.c_str()) != 0) {
         std::stringstream ss;
         ss << name.c_str() << ": Initialization error!!!";
@@ -118,13 +121,12 @@ void CB3ExecutorThread::run() {
     priority = getpriority(PRIO_PROCESS, 0);
 
     for (uint8_t tick = 1;; tick++) {
-
         if (state != EXECUTOR_RUNNING) {
             break;
         }
 
         updateCurrentTime();
-        if (TaskQueue *q = manager->nextTask(*this, tick)) {
+        if (TaskQueue* q = manager->nextTask(*this, tick)) {
             manager->startWork(taskType);
 
             if (currentTask->isdead()) {

engines/ep/src/executorthread.h renamed to engines/ep/src/cb3_executorthread.h

@@ -44,14 +44,15 @@ enum executor_state_t {
 class CB3ExecutorThread {
     friend class CB3ExecutorPool;
     friend class TaskQueue;
+
 public:
     /* The AtomicProcessTime class provides an abstraction for ensuring that
      * changes to a std::chrono::steady_clock::time_point are atomic.  This is
      * achieved by ensuring that all accesses are protected by a mutex.
      */
     class AtomicProcessTime {
     public:
-        AtomicProcessTime() {}
+        AtomicProcessTime() = default;
         explicit AtomicProcessTime(
                 const std::chrono::steady_clock::time_point& tp)
             : timepoint(tp) {
@@ -90,11 +91,11 @@ class CB3ExecutorThread {
 
     void run();
 
-    void stop(bool wait=true);
+    void stop(bool wait = true);
 
-    void schedule(ExTask &task);
+    void schedule(ExTask& task);
 
-    void wake(ExTask &task);
+    void wake(ExTask& task);
 
     // Changes this threads' current task to the specified task
     void setCurrentTask(ExTask newTask);
@@ -104,7 +105,9 @@ class CB3ExecutorThread {
      */
     void resetCurrentTask();
 
-    const std::string& getName() const { return name; }
+    const std::string& getName() const {
+        return name;
+    }
 
     std::string getTaskName();
 

engines/ep/src/fakes/fake_executorpool.h

@@ -29,7 +29,7 @@
 #pragma once
 
 #include "cb3_executorpool.h"
-#include "executorthread.h"
+#include "cb3_executorthread.h"
 #include "objectregistry.h"
 #include "taskqueue.h"
 

engines/ep/src/flusher.h

@@ -16,7 +16,7 @@
  */
 #pragma once
 
-#include "executorthread.h"
+#include "cb3_executorthread.h"
 #include "utility.h"
 #include "vb_ready_queue.h"
 

engines/ep/src/taskqueue.cc

@@ -17,7 +17,7 @@
 #include "taskqueue.h"
 #include "bucket_logger.h"
 #include "cb3_executorpool.h"
-#include "executorthread.h"
+#include "cb3_executorthread.h"
 
 #include <cmath>
 

engines/ep/tests/module_tests/executorpool_test.h

@@ -22,8 +22,8 @@
 #pragma once
 
 #include "../mock/mock_taskable.h"
+#include "cb3_executorthread.h"
 #include "executorpool.h"
-#include "executorthread.h"
 #include "fakes/fake_executorpool.h"
 #include "taskable.h"
 #include "thread_gate.h"