]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
test: move WaitEvent class to test_common.h file
authorshangdehao1 <dehao.shang@intel.com>
Mon, 24 Dec 2018 03:01:51 +0000 (11:01 +0800)
committerYuan Zhou <yuan.zhou@intel.com>
Thu, 21 Mar 2019 16:16:26 +0000 (00:16 +0800)
Signed-off-by: Dehao Shang <dehao.shang@intel.com>
src/test/immutable_object_cache/test_DomainSocket.cc
src/test/immutable_object_cache/test_common.h [new file with mode: 0644]

index d167d96dcaeb2f674d206ea69c12d9ca2e8a276f..bbac47044fcbec24090f110854944ede6071ee6c 100644 (file)
@@ -6,50 +6,15 @@
 
 #include "gtest/gtest.h"
 #include "include/Context.h"
-#include "common/Mutex.h"
-#include "common/Cond.h"
 #include "global/global_init.h"
 #include "global/global_context.h"
 
+#include "test/immutable_object_cache/test_common.h"
 #include "tools/immutable_object_cache/CacheClient.h"
 #include "tools/immutable_object_cache/CacheServer.h"
 
 using namespace ceph::immutable_obj_cache;
 
-// sequentialize async_operation
-class WaitEvent {
-public:
-  WaitEvent() : m_signaled(false) {
-    pthread_mutex_init(&m_lock, NULL);
-    pthread_cond_init(&m_cond, NULL);
-  }
-
-  ~WaitEvent() {
-    pthread_mutex_destroy(&m_lock);
-    pthread_cond_destroy(&m_cond);
-  }
-
-  void wait() {
-    pthread_mutex_lock(&m_lock);
-    while (!m_signaled) {
-      pthread_cond_wait(&m_cond, &m_lock);
-    }
-    m_signaled = false;
-    pthread_mutex_unlock(&m_lock);
-   }
-
-  void signal() {
-    pthread_mutex_lock(&m_lock);
-    m_signaled = true;
-    pthread_cond_signal(&m_cond);
-    pthread_mutex_unlock(&m_lock);
-  }
-private:
-    pthread_mutex_t m_lock;
-    pthread_cond_t m_cond;
-    bool m_signaled;
-};
-
 class TestCommunication :public ::testing::Test {
 public:
   CacheServer* m_cache_server;
diff --git a/src/test/immutable_object_cache/test_common.h b/src/test/immutable_object_cache/test_common.h
new file mode 100644 (file)
index 0000000..9fe944f
--- /dev/null
@@ -0,0 +1,42 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+#ifndef CACHE_TEST_COMMON_H
+#define CACHE_TEST_COMMON_H
+
+#include "common/Mutex.h"
+#include "common/Cond.h"
+
+class WaitEvent {
+public:
+  WaitEvent() : m_signaled(false) {
+    pthread_mutex_init(&m_lock, NULL);
+    pthread_cond_init(&m_cond, NULL);
+  }
+
+  ~WaitEvent() {
+    pthread_mutex_destroy(&m_lock);
+    pthread_cond_destroy(&m_cond);
+  }
+
+  void wait() {
+    pthread_mutex_lock(&m_lock);
+    while (!m_signaled) {
+      pthread_cond_wait(&m_cond, &m_lock);
+    }
+    m_signaled = false;
+    pthread_mutex_unlock(&m_lock);
+   }
+
+  void signal() {
+    pthread_mutex_lock(&m_lock);
+    m_signaled = true;
+    pthread_cond_signal(&m_cond);
+    pthread_mutex_unlock(&m_lock);
+  }
+private:
+    pthread_mutex_t m_lock;
+    pthread_cond_t m_cond;
+    bool m_signaled;
+};
+
+#endif