MB-29287: Move SynchronousEPEngine building to seperate method

Refactor the construction and setup of SynchronousEPEngine from
EventuallyPersistentStoreTest::SetUp() to a seperate builder function
- SynchronousEPEngine::build().

This allows tests which want to instantiate more than one ep-engine
instance to do so.

Change-Id: I647d32a28a2c3a1e1bfbca563c2a1ebe5130ad56
Reviewed-on: http://review.couchbase.org/93043
Well-Formed: Build Bot <[email protected]>
Tested-by: Build Bot <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>

Author: daverigby

src/ep_engine.h

@@ -1025,6 +1025,7 @@ class EventuallyPersistentEngine : public ENGINE_HANDLE_V1 {
                               int& keyOffset);
 
     SERVER_HANDLE_V1 *serverApi;
+    // epstore is an owning pointer.
     EventuallyPersistentStore *epstore;
     WorkLoadPolicy *workload;
     bucket_priority_t workloadPriority;

tests/module_tests/evp_store_single_threaded_test.h

@@ -63,7 +63,7 @@ class SingleThreadedEPStoreTest : public EventuallyPersistentStoreTest {
     }
 
     void TearDown() {
-        shutdownAndPurgeTasks();
+        shutdownAndPurgeTasks(engine.get());
         EventuallyPersistentStoreTest::TearDown();
     }
 
@@ -83,10 +83,11 @@ class SingleThreadedEPStoreTest : public EventuallyPersistentStoreTest {
     }
 
     /*
-     * Set the stats isShutdown and attempt to drive all tasks to cancel
+     * Set the stats isShutdown and attempt to drive all tasks to cancel for
+     * the specified engine.
      */
-    void shutdownAndPurgeTasks() {
-        engine->getEpStats().isShutdown = true;
+    void shutdownAndPurgeTasks(EventuallyPersistentEngine* ep) {
+        ep->getEpStats().isShutdown = true;
         task_executor->cancelAll();
 
         for (task_type_t t :
@@ -102,8 +103,9 @@ class SingleThreadedEPStoreTest : public EventuallyPersistentStoreTest {
                 }
             };
             runTasks(*task_executor->getLpTaskQ()[t]);
-            task_executor->stopTaskGroup(engine->getTaskable().getGID(), t,
-                                         engine->getEpStats().forceShutdown);
+            task_executor->stopTaskGroup(ep->getTaskable().getGID(),
+                                         t,
+                                         ep->getEpStats().forceShutdown);
         }
     }
 

tests/module_tests/evp_store_test.cc

@@ -81,6 +81,27 @@ void SynchronousEPEngine::setEPStore(EventuallyPersistentStore* store) {
     epstore = store;
 }
 
+std::unique_ptr<SynchronousEPEngine> SynchronousEPEngine::build(
+        const std::string& config) {
+    std::unique_ptr<SynchronousEPEngine> engine(
+            new SynchronousEPEngine(config));
+
+    // switch current thread to this new engine, so all sub-created objects
+    // are accounted in it's mem_used.
+    ObjectRegistry::onSwitchThread(engine.get());
+
+    engine->setEPStore(new MockEPStore(*engine));
+
+    // Ensure that EPEngine is told about necessary server callbacks
+    // (client disconnect, bucket delete).
+    engine->public_initializeEngineCallbacks();
+
+    // Swtich current thread off this engine.
+    ObjectRegistry::onSwitchThread(nullptr);
+
+    return engine;
+}
+
 MockEPStore::MockEPStore(EventuallyPersistentEngine &theEngine)
     : EventuallyPersistentStore(theEngine) {
     // Perform a limited set of setup (normally done by EPStore::initialize) -
@@ -114,31 +135,26 @@ void EventuallyPersistentStoreTest::SetUp() {
     // from a previous run.
     CouchbaseDirectoryUtilities::rmrf(test_dbname);
 
+    // Need to initialize ep_real_time and friends.
+    initialize_time_functions(get_mock_server_api()->core);
+
     // Add dbname to config string.
     std::string config = config_string;
     if (config.size() > 0) {
         config += ";";
     }
     config += "dbname=" + std::string(test_dbname);
 
-    engine.reset(new SynchronousEPEngine(config));
-    ObjectRegistry::onSwitchThread(engine.get());
-
-    store = new MockEPStore(*engine);
-    engine->setEPStore(store);
-
-    // Ensure that EPEngine is hold about necessary server callbacks
-    // (client disconnect, bucket delete).
-    engine->public_initializeEngineCallbacks();
-
-    // Need to initialize ep_real_time and friends.
-    initialize_time_functions(get_mock_server_api()->core);
+    engine = SynchronousEPEngine::build(config);
+    store = reinterpret_cast<MockEPStore*>(engine->getEpStore());
 
     cookie = create_mock_cookie();
 }
 
 void EventuallyPersistentStoreTest::TearDown() {
-    destroy_mock_cookie(cookie);
+    if (cookie) {
+        destroy_mock_cookie(cookie);
+    }
     destroy_mock_event_callbacks();
     engine->getDcpConnMap().manageConnections();
     engine.reset();

tests/module_tests/evp_store_test.h

@@ -49,6 +49,11 @@ class SynchronousEPEngine : public EventuallyPersistentEngine {
 
     void setEPStore(EventuallyPersistentStore* store);
 
+    /// Constructs a SynchronousEPEngine instance, along with the necessary
+    /// sub-components.
+    static std::unique_ptr<SynchronousEPEngine> build(
+            const std::string& config);
+
     /* Allow us to call normally protected methods */
 
     ENGINE_ERROR_CODE public_doTapVbTakeoverStats(const void *cookie,