调整目录结构，隔离include路径，修正tls在win下的问题

LICENSE

@@ -1,4 +1,4 @@
-cpp-ipc - A high-performance inter-process communication using shared memory on Linux/Windows.
+cpp-ipc(libipc) - A high-performance inter-process communication using shared memory on Linux/Windows.
 
 Copyright (c) 2018 mutouyun (http://orzz.org)
 

README.md

@@ -1,4 +1,4 @@
-# cpp-ipc - C++ IPC Library
+# cpp-ipc(libipc) - C++ IPC Library
 
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/mutouyun/cpp-ipc/blob/master/LICENSE) [![Build Status](https://travis-ci.org/mutouyun/cpp-ipc.svg?branch=master)](https://travis-ci.org/mutouyun/cpp-ipc) [![Build status](https://ci.appveyor.com/api/projects/status/github/mutouyun/cpp-ipc?branch=master&svg=true)](https://ci.appveyor.com/project/mutouyun/cpp-ipc)
  

demo/chat/main.cpp

@@ -4,7 +4,7 @@
 #include <regex>
 #include <atomic>
 
-#include "ipc.h"
+#include "libipc/ipc.h"
 
 namespace {
 

include/libipc/buffer.h

@@ -5,8 +5,8 @@
 #include <vector>
 #include <type_traits>
 
-#include "export.h"
+#include "libipc/export.h"
-#include "def.h"
+#include "libipc/def.h"
 
 namespace ipc {
 

include/libipc/ipc.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "export.h"
-#include "def.h"
-#include "buffer.h"
-#include "shm.h"
-
 #include <string>
 
+#include "libipc/export.h"
+#include "libipc/def.h"
+#include "libipc/buffer.h"
+#include "libipc/shm.h"
+
 namespace ipc {
 
 using handle_t = void*;

include/libipc/pool_alloc.h

@@ -3,8 +3,8 @@
 #include <new>
 #include <utility>
 
-#include "export.h"
+#include "libipc/export.h"
-#include "def.h"
+#include "libipc/def.h"
 
 namespace ipc {
 namespace mem {

include/libipc/shm.h

@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "export.h"
+#include "libipc/export.h"
 
 namespace ipc {
 namespace shm {

include/libipc/tls_pointer.h

@@ -4,8 +4,7 @@
 #include <utility>  // std::forward
 #include <cstddef>  // std::size_t
 
-#include "export.h"
+#include "libipc/export.h"
-#include "platform/detail.h"
 
 namespace ipc {
 namespace tls {
@@ -69,7 +68,7 @@ public:
     template <typename... P>
     T* create(P&&... params) {
         destruct();
-        auto ptr = detail::unique_ptr(new T(std::forward<P>(params)...));
+        std::unique_ptr<T> ptr { new T(std::forward<P>(params)...) };
         if (!tls::set(this, ptr.get())) {
             return nullptr;
         }
@@ -80,7 +79,7 @@ public:
     T* create_once(P&&... params) {
         auto p = static_cast<T*>(tls::get(this));
         if (p == nullptr) {
-            auto ptr = detail::unique_ptr(new T(std::forward<P>(params)...));
+            std::unique_ptr<T> ptr { new T(std::forward<P>(params)...) };
             if (!tls::set(this, ptr.get())) {
                 return nullptr;
             }

include/libipc/waiter.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "export.h"
+#include "libipc/export.h"
-#include "def.h"
+#include "libipc/def.h"
 
 namespace ipc {
 

src/CMakeLists.txt

@@ -11,12 +11,19 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src)
 
 if(UNIX)
-  file(GLOB SRC_FILES ${CMAKE_SOURCE_DIR}/src/platform/*_linux.cpp)
+  file(GLOB SRC_FILES ${CMAKE_SOURCE_DIR}/src/libipc/platform/*_linux.cpp)
 else()
-  file(GLOB SRC_FILES ${CMAKE_SOURCE_DIR}/src/platform/*_win.cpp)
+  file(GLOB SRC_FILES ${CMAKE_SOURCE_DIR}/src/libipc/platform/*_win.cpp)
 endif()
 aux_source_directory(${CMAKE_SOURCE_DIR}/src SRC_FILES)
-file(GLOB HEAD_FILES ${CMAKE_SOURCE_DIR}/include/*.h ${CMAKE_SOURCE_DIR}/src/*.inc ${CMAKE_SOURCE_DIR}/src/memory/*.hpp)
+
+file(GLOB HEAD_FILES
+  ${CMAKE_SOURCE_DIR}/include/libipc/*.h
+  ${CMAKE_SOURCE_DIR}/src/libipc/*.inc
+  ${CMAKE_SOURCE_DIR}/src/libipc/circ/*.h
+  ${CMAKE_SOURCE_DIR}/src/libipc/memory/*.h
+  ${CMAKE_SOURCE_DIR}/src/libipc/platform/*.h
+  ${CMAKE_SOURCE_DIR}/src/libipc/utility/*.h)
 
 add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${HEAD_FILES})
 if(NOT MSVC)

src/buffer.cpp

@@ -1,5 +1,5 @@
-#include "buffer.h"
+#include "libipc/buffer.h"
-#include "pimpl.h"
+#include "libipc/utility/pimpl.h"
 
 #include <cstring>
 

src/ipc.cpp

@@ -1,4 +1,3 @@
-#include "ipc.h"
 
 #include <type_traits>
 #include <cstring>
@@ -10,22 +9,24 @@
 #include <vector>
 #include <array>
 
-#include "def.h"
+#include "libipc/ipc.h"
-#include "shm.h"
+#include "libipc/def.h"
-#include "tls_pointer.h"
+#include "libipc/shm.h"
-#include "pool_alloc.h"
+#include "libipc/tls_pointer.h"
-#include "queue.h"
+#include "libipc/pool_alloc.h"
-#include "policy.h"
+#include "libipc/queue.h"
-#include "rw_lock.h"
+#include "libipc/policy.h"
-#include "log.h"
+#include "libipc/rw_lock.h"
-#include "id_pool.h"
 
-#include "memory/resource.h"
+#include "libipc/utility/log.h"
+#include "libipc/utility/id_pool.h"
 
-#include "platform/detail.h"
+#include "libipc/memory/resource.h"
-#include "platform/waiter_wrapper.h"
 
-#include "circ/elem_array.h"
+#include "libipc/platform/detail.h"
+#include "libipc/platform/waiter_wrapper.h"
+
+#include "libipc/circ/elem_array.h"
 
 namespace {
 

src/libipc/circ/elem_array.h

@@ -4,10 +4,10 @@
 #include <utility>
 #include <type_traits>
 
-#include "def.h"
+#include "libipc/def.h"
 
-#include "circ/elem_def.h"
+#include "libipc/circ/elem_def.h"
-#include "platform/detail.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace circ {

src/libipc/circ/elem_def.h

@@ -5,9 +5,9 @@
 #include <cstdint>
 #include <new>
 
-#include "rw_lock.h"
+#include "libipc/rw_lock.h"
 
-#include "platform/detail.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace circ {

src/libipc/memory/alloc.h

@@ -7,12 +7,12 @@
 #include <cstdlib>
 #include <cassert>      // assert
 
-#include "def.h"
+#include "libipc/def.h"
-#include "rw_lock.h"
+#include "libipc/rw_lock.h"
-#include "concept.h"
 
-#include "memory/allocator_wrapper.h"
+#include "libipc/utility/concept.h"
-#include "platform/detail.h"
+#include "libipc/memory/allocator_wrapper.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace mem {

src/libipc/memory/allocator_wrapper.h

@@ -3,7 +3,8 @@
 #include <limits>   // std::numeric_limits
 #include <utility>  // std::forward
 #include <cstddef>
-#include <new>      // ::new
+
+#include "libipc/pool_alloc.h"
 
 namespace ipc {
 namespace mem {
@@ -86,11 +87,11 @@ public:
 
     template <typename... P>
     static void construct(pointer p, P && ... params) {
-        ::new (static_cast<void*>(p)) value_type(std::forward<P>(params) ...);
+        ipc::mem::construct(p, std::forward<P>(params)...);
     }
 
     static void destroy(pointer p) {
-        p->~value_type();
+        ipc::mem::destruct(p);
     }
 };
 

src/libipc/memory/resource.h

@@ -8,11 +8,11 @@
 #include <string>
 #include <cstdio>
 
-#include "def.h"
+#include "libipc/def.h"
 
-#include "memory/alloc.h"
+#include "libipc/memory/alloc.h"
-#include "memory/wrapper.h"
+#include "libipc/memory/wrapper.h"
-#include "platform/detail.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace mem {

src/libipc/memory/wrapper.h

@@ -8,15 +8,15 @@
 #include <cstddef>
 #include <cassert>      // assert
 #include <type_traits>  // std::aligned_storage_t
-#include <new>          // ::new
 
-#include "def.h"
+#include "libipc/def.h"
-#include "rw_lock.h"
+#include "libipc/rw_lock.h"
-#include "tls_pointer.h"
+#include "libipc/tls_pointer.h"
-#include "concept.h"
+#include "libipc/pool_alloc.h"
 
-#include "memory/alloc.h"
+#include "libipc/utility/concept.h"
-#include "platform/detail.h"
+#include "libipc/memory/alloc.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace mem {
@@ -230,7 +230,9 @@ struct default_mapping_policy {
 
     template <typename F, typename ... P>
     IPC_CONSTEXPR_ static void foreach(F && f, P && ... params) {
-        for (std::size_t i = 0; i < classes_size; ++i) f(i, std::forward<P>(params)...);
+        for (std::size_t i = 0; i < classes_size; ++i) {
+            f(i, std::forward<P>(params)...);
+        }
     }
 
     IPC_CONSTEXPR_ static std::size_t block_size(std::size_t id) noexcept {
@@ -240,7 +242,9 @@ struct default_mapping_policy {
     template <typename F, typename D, typename ... P>
     IPC_CONSTEXPR_ static auto classify(F && f, D && d, std::size_t size, P && ... params) {
         std::size_t id = (size - base_size - 1) / iter_size;
-        return (id < classes_size) ? f(id, size, std::forward<P>(params)...) : d(size, std::forward<P>(params)...);
+        return (id < classes_size) ? 
+            f(id, size, std::forward<P>(params)...) : 
+            d(size, std::forward<P>(params)...);
     }
 };
 
@@ -256,13 +260,13 @@ class variable_wrapper {
 
         initiator() {
             MappingP::foreach([](std::size_t id, falc_t * a) {
-                ::new (&(a[id])) FixedAlloc(MappingP::block_size(id));
+                ipc::mem::construct(&initiator::at(a, id), MappingP::block_size(id));
             }, arr_);
         }
 
         ~initiator() {
             MappingP::foreach([](std::size_t id, falc_t * a) {
-                initiator::at(a, id).~FixedAlloc();
+                ipc::mem::destruct(&initiator::at(a, id));
             }, arr_);
         }
 

src/libipc/platform/shm_linux.cpp

@@ -1,4 +1,3 @@
-#include "shm.h"
 
 #include <sys/shm.h>
 #include <sys/stat.h>
@@ -13,11 +12,12 @@
 #include <utility>
 #include <cstring>
 
-#include "def.h"
+#include "libipc/shm.h"
-#include "log.h"
+#include "libipc/def.h"
-#include "pool_alloc.h"
+#include "libipc/pool_alloc.h"
 
-#include "memory/resource.h"
+#include "libipc/utility/log.h"
+#include "libipc/memory/resource.h"
 
 namespace {
 

src/libipc/platform/shm_win.cpp

@@ -1,17 +1,17 @@
-#include "shm.h"
 
 #include <Windows.h>
 
 #include <string>
 #include <utility>
 
-#include "def.h"
+#include "libipc/shm.h"
-#include "log.h"
+#include "libipc/def.h"
-#include "pool_alloc.h"
+#include "libipc/pool_alloc.h"
 
-#include "platform/to_tchar.h"
+#include "libipc/utility/log.h"
-#include "platform/get_sa.h"
+#include "libipc/platform/to_tchar.h"
-#include "memory/resource.h"
+#include "libipc/platform/get_sa.h"
+#include "libipc/memory/resource.h"
 
 namespace {
 

src/libipc/platform/tls_detail_win.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <unordered_map>    // std::unordered_map
+#include <cassert>          // assert
+
+#include "libipc/tls_pointer.h"
+
+#include "libipc/utility/utility.h"
+
+namespace ipc {
+namespace tls {
+
+inline void tls_destruct(key_info const * pkey, void * p) {
+    assert(pkey != nullptr);
+    auto destructor = horrible_cast<destructor_t>(pkey->key_);
+    if (destructor != nullptr) destructor(p);
+}
+
+struct tls_recs : public std::unordered_map<key_info const *, void *> {
+    ~tls_recs() {
+        for (auto & pair : *this) {
+            tls_destruct(pair.first, pair.second);
+        }
+    }
+};
+
+inline tls_recs * tls_get_recs() {
+    thread_local tls_recs * recs_ptr = nullptr;
+    if (recs_ptr == nullptr) {
+        recs_ptr = new tls_recs;
+    }
+    assert(recs_ptr != nullptr);
+    return recs_ptr;
+}
+
+inline void at_thread_exit() {
+    delete tls_get_recs();
+}
+
+} // namespace tls
+} // namespace ipc

src/libipc/platform/tls_pointer_linux.h

@@ -1,12 +1,13 @@
-#include "tls_pointer.h"
 
 #include <pthread.h>    // pthread_...
 
 #include <atomic>       // std::atomic_thread_fence
 #include <cassert>      // assert
 
-#include "log.h"
+#include "libipc/tls_pointer.h"
-#include "utility.h"
+
+#include "libipc/utility/log.h"
+#include "libipc/utility/utility.h"
 
 namespace ipc {
 namespace tls {

src/libipc/platform/tls_pointer_win.cpp

@@ -1,8 +1,8 @@
-#include "tls_pointer.h"
-#include "log.h"
 
 #include <Windows.h>
 
+#include "libipc/platform/tls_detail_win.h"
+
 /**
  * @remarks
  * Windows doesn't support a per-thread destructor with its TLS primitives.
@@ -19,8 +19,6 @@
 namespace ipc {
 namespace tls {
 
-void at_thread_exit();
-
 namespace {
 
 void NTAPI OnTlsCallback(PVOID, DWORD dwReason, PVOID) {

src/libipc/platform/tls_pointer_win.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <atomic>   // std::atomic_thread_fence
+#include <cassert>  // assert
+
+#include "libipc/tls_pointer.h"
+
+#include "libipc/platform/tls_detail_win.h"
+#include "libipc/utility/utility.h"
+
+namespace ipc {
+namespace tls {
+
+bool create(key_info * pkey, destructor_t destructor) {
+    assert(pkey != nullptr);
+    pkey->key_ = horrible_cast<key_t>(destructor);
+    std::atomic_thread_fence(std::memory_order_seq_cst);
+    return true;
+}
+
+void release(key_info const * pkey) {
+    assert(pkey != nullptr);
+    assert(tls_get_recs() != nullptr);
+    tls_get_recs()->erase(pkey);
+}
+
+bool set(key_info const * pkey, void * ptr) {
+    assert(pkey != nullptr);
+    assert(tls_get_recs() != nullptr);
+    (*tls_get_recs())[pkey] = ptr;
+    return true;
+}
+
+void * get(key_info const * pkey) {
+    assert(pkey != nullptr);
+    assert(tls_get_recs() != nullptr);
+    auto const recs = tls_get_recs();
+    auto it = recs->find(pkey);
+    if (it == recs->end()) {
+        return nullptr;
+    }
+    return it->second;
+}
+
+} // namespace tls
+} // namespace ipc

src/libipc/platform/to_tchar.h

@@ -8,10 +8,9 @@
 #include <codecvt>
 #include <cstring>
 
-#include "concept.h"
+#include "libipc/utility/concept.h"
-
+#include "libipc/platform/detail.h"
-#include "platform/detail.h"
+#include "libipc/memory/resource.h"
-#include "memory/resource.h"
 
 namespace ipc {
 namespace detail {

src/libipc/platform/waiter_linux.h

@@ -10,11 +10,11 @@
 #include <atomic>
 #include <tuple>
 
-#include "def.h"
+#include "libipc/def.h"
-#include "log.h"
 
-#include "platform/detail.h"
+#include "libipc/utility/log.h"
-#include "memory/resource.h"
+#include "libipc/platform/detail.h"
+#include "libipc/memory/resource.h"
 
 namespace ipc {
 namespace detail {

src/libipc/platform/waiter_win.h

@@ -5,15 +5,15 @@
 #include <atomic>
 #include <tuple>
 
-#include "rw_lock.h"
+#include "libipc/rw_lock.h"
-#include "pool_alloc.h"
+#include "libipc/pool_alloc.h"
-#include "log.h"
+#include "libipc/shm.h"
-#include "shm.h"
 
-#include "platform/to_tchar.h"
+#include "libipc/utility/log.h"
-#include "platform/get_sa.h"
+#include "libipc/platform/to_tchar.h"
-#include "platform/detail.h"
+#include "libipc/platform/get_sa.h"
-#include "memory/resource.h"
+#include "libipc/platform/detail.h"
+#include "libipc/memory/resource.h"
 
 namespace ipc {
 namespace detail {

src/libipc/platform/waiter_wrapper.h

@@ -4,15 +4,15 @@
 #include <atomic>
 #include <utility>
 
-#include "shm.h"
+#include "libipc/shm.h"
 
-#include "memory/resource.h"
+#include "libipc/memory/resource.h"
-#include "platform/detail.h"
+#include "libipc/platform/detail.h"
 #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__) || \
     defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || \
     defined(WINCE) || defined(_WIN32_WCE)
 
-#include "platform/waiter_win.h"
+#include "libipc/platform/waiter_win.h"
 
 namespace ipc {
 namespace detail {
@@ -58,7 +58,7 @@ public:
 
 #else /*!WIN*/
 
-#include "platform/waiter_linux.h"
+#include "libipc/platform/waiter_linux.h"
 
 namespace ipc {
 namespace detail {

src/libipc/policy.h

@@ -2,10 +2,10 @@
 
 #include <type_traits>
 
-#include "def.h"
+#include "libipc/def.h"
-#include "prod_cons.h"
+#include "libipc/prod_cons.h"
 
-#include "circ/elem_array.h"
+#include "libipc/circ/elem_array.h"
 
 namespace ipc {
 namespace policy {

src/libipc/prod_cons.h

@@ -5,11 +5,12 @@
 #include <cstring>
 #include <type_traits>
 
-#include "def.h"
+#include "libipc/def.h"
-#include "platform/detail.h"
+
-#include "circ/elem_def.h"
+#include "libipc/platform/detail.h"
-#include "log.h"
+#include "libipc/circ/elem_def.h"
-#include "utility.h"
+#include "libipc/utility/log.h"
+#include "libipc/utility/utility.h"
 
 namespace ipc {
 

src/libipc/queue.h

@@ -11,13 +11,13 @@
 #include <string>
 #include <cassert>  // assert
 
-#include "def.h"
+#include "libipc/def.h"
-#include "shm.h"
+#include "libipc/shm.h"
-#include "log.h"
+#include "libipc/rw_lock.h"
-#include "rw_lock.h"
 
-#include "platform/detail.h"
+#include "libipc/utility/log.h"
-#include "circ/elem_def.h"
+#include "libipc/platform/detail.h"
+#include "libipc/circ/elem_def.h"
 
 namespace ipc {
 namespace detail {

src/libipc/utility/id_pool.h

@@ -3,9 +3,9 @@
 #include <type_traits>  // std::aligned_storage_t
 #include <cstring>      // std::memcmp
 
-#include "def.h"
+#include "libipc/def.h"
 
-#include "platform/detail.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 

src/libipc/utility/pimpl.h

@@ -3,8 +3,8 @@
 #include <new>
 #include <utility>
 
-#include "concept.h"
+#include "libipc/utility/concept.h"
-#include "pool_alloc.h"
+#include "libipc/pool_alloc.h"
 
 namespace ipc {
 

src/libipc/utility/utility.h

@@ -4,7 +4,7 @@
 #include <cstddef>  // std::size_t
 #include <new>      // std::hardware_destructive_interference_size
 
-#include "platform/detail.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 

src/platform/tls_pointer_win.h

@@ -1,76 +0,0 @@
-#pragma once
-
-#include <unordered_map>    // std::unordered_map
-#include <atomic>           // std::atomic_thread_fence
-#include <cassert>          // assert
-
-#include "log.h"
-#include "utility.h"
-
-namespace ipc {
-namespace tls {
-
-namespace {
-
-inline void tls_destruct(key_info const * pkey, void * p) {
-    assert(pkey != nullptr);
-    auto destructor = horrible_cast<destructor_t>(pkey->key_);
-    if (destructor != nullptr) destructor(p);
-}
-
-struct tls_recs : public std::unordered_map<key_info const *, void *> {
-    ~tls_recs() {
-        for (auto & pair : *this) {
-            tls_destruct(pair.first, pair.second);
-        }
-    }
-};
-
-inline tls_recs * tls_get_recs() {
-    thread_local tls_recs * recs_ptr = nullptr;
-    if (recs_ptr == nullptr) {
-        recs_ptr = new tls_recs;
-    }
-    assert(recs_ptr != nullptr);
-    return recs_ptr;
-}
-
-} // internal-linkage
-
-void at_thread_exit() {
-    delete tls_get_recs();
-}
-
-bool create(key_info * pkey, destructor_t destructor) {
-    assert(pkey != nullptr);
-    pkey->key_ = horrible_cast<key_t>(destructor);
-    std::atomic_thread_fence(std::memory_order_seq_cst);
-    return true;
-}
-
-void release(key_info const * pkey) {
-    assert(pkey != nullptr);
-    assert(tls_get_recs() != nullptr);
-    tls_get_recs()->erase(pkey);
-}
-
-bool set(key_info const * pkey, void * ptr) {
-    assert(pkey != nullptr);
-    assert(tls_get_recs() != nullptr);
-    (*tls_get_recs())[pkey] = ptr;
-    return true;
-}
-
-void * get(key_info const * pkey) {
-    assert(pkey != nullptr);
-    assert(tls_get_recs() != nullptr);
-    auto const recs = tls_get_recs();
-    auto it = recs->find(pkey);
-    if (it == recs->end()) {
-        return nullptr;
-    }
-    return it->second;
-}
-
-} // namespace tls
-} // namespace ipc

src/pool_alloc.cpp

@@ -1,6 +1,6 @@
-#include "pool_alloc.h"
+#include "libipc/pool_alloc.h"
 
-#include "memory/resource.h"
+#include "libipc/memory/resource.h"
 
 namespace ipc {
 namespace mem {

src/shm.cpp

@@ -1,10 +1,11 @@
-#include "shm.h"
 
 #include <string>
 #include <utility>
 
-#include "pimpl.h"
+#include "libipc/shm.h"
-#include "memory/resource.h"
+
+#include "libipc/utility/pimpl.h"
+#include "libipc/memory/resource.h"
 
 namespace ipc {
 namespace shm {

src/tls_pointer.cpp

@@ -1,9 +1,8 @@
-#include "tls_pointer.h"
 
 #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__) || \
     defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || \
     defined(WINCE) || defined(_WIN32_WCE)
-#include "platform/tls_pointer_win.h"
+#include "libipc/platform/tls_pointer_win.h"
 #else /*!WIN*/
-#include "platform/tls_pointer_linux.h"
+#include "libipc/platform/tls_pointer_linux.h"
 #endif/*!WIN*/

src/waiter.cpp

@@ -1,9 +1,10 @@
-#include "waiter.h"
 
 #include <string>
 
-#include "pimpl.h"
+#include "libipc/waiter.h"
-#include "platform/waiter_wrapper.h"
+
+#include "libipc/utility/pimpl.h"
+#include "libipc/platform/waiter_wrapper.h"
 
 #undef IPC_PP_CAT_
 #undef IPC_PP_JOIN_T__
@@ -23,7 +24,7 @@ namespace ipc {
 #define IPC_OBJECT_TYPE_OPEN_PARS_
 #define IPC_OBJECT_TYPE_OPEN_ARGS_
 
-#include "waiter_template.inc"
+#include "libipc/waiter_template.inc"
 
 bool mutex::lock() {
     return impl(p_)->h_.lock();
@@ -41,7 +42,7 @@ bool mutex::unlock() {
 #define IPC_OBJECT_TYPE_OPEN_PARS_ , long count
 #define IPC_OBJECT_TYPE_OPEN_ARGS_ , count
 
-#include "waiter_template.inc"
+#include "libipc/waiter_template.inc"
 
 bool semaphore::wait(std::size_t tm) {
     return impl(p_)->h_.wait(tm);
@@ -59,7 +60,7 @@ bool semaphore::post(long count) {
 #define IPC_OBJECT_TYPE_OPEN_PARS_
 #define IPC_OBJECT_TYPE_OPEN_ARGS_
 
-#include "waiter_template.inc"
+#include "libipc/waiter_template.inc"
 
 bool condition::wait(mutex& mtx, std::size_t tm) {
     return impl(p_)->h_.wait(impl(mtx.p_)->h_, tm);

test/test_ipc.cpp

@@ -3,9 +3,9 @@
 #include <iostream>
 #include <cstring>
 
-#include "ipc.h"
+#include "libipc/ipc.h"
-#include "buffer.h"
+#include "libipc/buffer.h"
-#include "memory/resource.h"
+#include "libipc/memory/resource.h"
 
 #include "test.h"
 #include "thread_pool.h"

test/test_mem.cpp

@@ -6,8 +6,8 @@
 
 #include "capo/random.hpp"
 
-#include "memory/resource.h"
+#include "libipc/memory/resource.h"
-#include "pool_alloc.h"
+#include "libipc/pool_alloc.h"
 
 // #include "gperftools/tcmalloc.h"
 

test/test_queue.cpp

@@ -6,10 +6,10 @@
 #include <vector>
 #include <unordered_map>
 
-#include "prod_cons.h"
+#include "libipc/prod_cons.h"
-#include "policy.h"
+#include "libipc/policy.h"
-#include "circ/elem_array.h"
+#include "libipc/circ/elem_array.h"
-#include "queue.h"
+#include "libipc/queue.h"
 
 #include "test.h"
 

test/test_shm.cpp

@@ -2,7 +2,7 @@
 #include <cstdint>
 #include <thread>
 
-#include "shm.h"
+#include "libipc/shm.h"
 #include "test.h"
 
 using namespace ipc::shm;

test/test_thread_utility.cpp

@@ -10,8 +10,8 @@
 #include "capo/spin_lock.hpp"
 #include "capo/type_name.hpp"
 
-#include "rw_lock.h"
+#include "libipc/rw_lock.h"
-#include "tls_pointer.h"
+#include "libipc/tls_pointer.h"
 
 #include "test.h"
 #include "thread_pool.h"

test/test_waiter.cpp

@@ -1,7 +1,7 @@
 #include <thread>
 #include <iostream>
 
-#include "platform/waiter_wrapper.h"
+#include "libipc/platform/waiter_wrapper.h"
 #include "test.h"
 
 namespace {