merge issue-61; add condition for linux

Author: mutouyun

include/libipc/condition.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>  // std::uint64_t
+
+#include "libipc/export.h"
+#include "libipc/def.h"
+#include "libipc/mutex.h"
+
+namespace ipc {
+namespace sync {
+
+class IPC_EXPORT condition {
+    condition(condition const &) = delete;
+    condition &operator=(condition const &) = delete;
+
+public:
+    condition();
+    explicit condition(char const *name);
+    ~condition();
+
+    void const *native() const noexcept;
+    void *native() noexcept;
+
+    bool valid() const noexcept;
+
+    bool open(char const *name) noexcept;
+    void close() noexcept;
+
+    bool wait(ipc::sync::mutex &mtx, std::uint64_t tm = ipc::invalid_value) noexcept;
+    bool notify() noexcept;
+    bool broadcast() noexcept;
+
+private:
+    class condition_;
+    condition_* p_;
+};
+
+} // namespace sync
+} // namespace ipc

src/CMakeLists.txt

@@ -5,7 +5,8 @@ if(UNIX)
 else()
   file(GLOB SRC_FILES ${LIBIPC_PROJECT_DIR}/src/libipc/platform/*_win.cpp)
 endif()
-aux_source_directory(${LIBIPC_PROJECT_DIR}/src SRC_FILES)
+aux_source_directory(${LIBIPC_PROJECT_DIR}/src/libipc SRC_FILES)
+aux_source_directory(${LIBIPC_PROJECT_DIR}/src/libipc/sync SRC_FILES)
 
 file(GLOB HEAD_FILES
   ${LIBIPC_PROJECT_DIR}/include/libipc/*.h
@@ -37,8 +38,8 @@ set_target_properties(${PROJECT_NAME}
 # set version
 set_target_properties(${PROJECT_NAME}
     PROPERTIES
-    VERSION 1.0.0
-    SOVERSION 1)
+    VERSION 1.1.0
+    SOVERSION 2)
 
 target_include_directories(${PROJECT_NAME}
   PUBLIC  ${LIBIPC_PROJECT_DIR}/include

src/buffer.cpp src/libipc/buffer.cppsrc/buffer.cpp renamed to src/libipc/buffer.cpp

@@ -1,12 +1,15 @@
 #pragma once
 
 #include <cstdint>
+#include <cstring>
 
 #include <pthread.h>
 
-#include "libipc/utility/log.h"
 #include "libipc/platform/get_wait_time.h"
+#include "libipc/utility/log.h"
+#include "libipc/utility/scope_guard.h"
 #include "libipc/mutex.h"
+#include "libipc/shm.h"
 
 namespace ipc {
 namespace detail {
@@ -89,7 +92,7 @@ class condition {
             return true;
         case invalid_value: {
                 int eno;
-                if ((eno = ::pthread_cond_wait(cond_, mtx.native())) != 0) {
+                if ((eno = ::pthread_cond_wait(cond_, static_cast<pthread_mutex_t *>(mtx.native()))) != 0) {
                     ipc::error("fail pthread_cond_wait[%d]\n", eno);
                     return false;
                 }
@@ -98,7 +101,7 @@ class condition {
         default: {
                 auto ts = detail::make_timespec(tm);
                 int eno;
-                if ((eno = ::pthread_cond_timedwait(cond_, mtx.native(), &ts)) != 0) {
+                if ((eno = ::pthread_cond_timedwait(cond_, static_cast<pthread_mutex_t *>(mtx.native()), &ts)) != 0) {
                     if (eno != ETIMEDOUT) {
                         ipc::error("fail pthread_cond_timedwait[%d]: tm = %zd, tv_sec = %ld, tv_nsec = %ld\n",
                                    eno, tm, ts.tv_sec, ts.tv_nsec);

src/ipc.cpp src/libipc/ipc.cppsrc/ipc.cpp renamed to src/libipc/ipc.cpp

@@ -0,0 +1,70 @@
+
+#include "libipc/condition.h"
+
+#include "libipc/utility/pimpl.h"
+#include "libipc/memory/resource.h"
+#include "libipc/platform/detail.h"
+#if defined(IPC_OS_WINDOWS_)
+#include "libipc/platform/condition_win.h"
+#elif defined(IPC_OS_LINUX_)
+#include "libipc/platform/condition_linux.h"
+#else/*linux*/
+#   error "Unsupported platform."
+#endif
+
+namespace ipc {
+namespace sync {
+
+class condition::condition_ : public ipc::pimpl<condition_> {
+public:
+    ipc::detail::sync::condition cond_;
+};
+
+condition::condition()
+    : p_(p_->make()) {
+}
+
+condition::condition(char const * name)
+    : condition() {
+    open(name);
+}
+
+condition::~condition() {
+    close();
+    p_->clear();
+}
+
+void const *condition::native() const noexcept {
+    return impl(p_)->cond_.native();
+}
+
+void *condition::native() noexcept {
+    return impl(p_)->cond_.native();
+}
+
+bool condition::valid() const noexcept {
+    return impl(p_)->cond_.valid();
+}
+
+bool condition::open(char const *name) noexcept {
+    return impl(p_)->cond_.open(name);
+}
+
+void condition::close() noexcept {
+    impl(p_)->cond_.close();
+}
+
+bool condition::wait(ipc::sync::mutex &mtx, std::uint64_t tm) noexcept {
+    return impl(p_)->cond_.wait(mtx, tm);
+}
+
+bool condition::notify() noexcept {
+    return impl(p_)->cond_.notify();
+}
+
+bool condition::broadcast() noexcept {
+    return impl(p_)->cond_.broadcast();
+}
+
+} // namespace sync
+} // namespace ipc