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

mutouyun · Sep 13, 2020 · 523d38d · 523d38d
1 parent 94c1043
commit 523d38d
Show file tree

Hide file tree

Showing 53 changed files with 252 additions and 229 deletions.
diff --git a/LICENSE b/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)
 

diff --git a/README.md b/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)
 

diff --git a/demo/chat/main.cpp b/demo/chat/main.cpp
@@ -4,7 +4,7 @@
 #include <regex>
 #include <atomic>
 
-#include "ipc.h"
+#include "libipc/ipc.h"
 
 namespace {
 

diff --git a/include/buffer.h → include/libipc/buffer.h b/include/buffer.h → include/libipc/buffer.h
@@ -5,8 +5,8 @@
 #include <vector>
 #include <type_traits>
 
-#include "export.h"
-#include "def.h"
+#include "libipc/export.h"
+#include "libipc/def.h"
 
 namespace ipc {
 

diff --git a/include/def.h → include/libipc/def.h b/include/def.h → include/libipc/def.h
diff --git a/include/export.h → include/libipc/export.h b/include/export.h → include/libipc/export.h
diff --git a/include/ipc.h → include/libipc/ipc.h b/include/ipc.h → 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*;

diff --git a/include/pool_alloc.h → include/libipc/pool_alloc.h b/include/pool_alloc.h → include/libipc/pool_alloc.h
@@ -3,8 +3,8 @@
 #include <new>
 #include <utility>
 
-#include "export.h"
-#include "def.h"
+#include "libipc/export.h"
+#include "libipc/def.h"
 
 namespace ipc {
 namespace mem {

diff --git a/include/rw_lock.h → include/libipc/rw_lock.h b/include/rw_lock.h → include/libipc/rw_lock.h
diff --git a/include/shm.h → include/libipc/shm.h b/include/shm.h → include/libipc/shm.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "export.h"
+#include "libipc/export.h"
 
 namespace ipc {
 namespace shm {

diff --git a/include/tls_pointer.h → include/libipc/tls_pointer.h b/include/tls_pointer.h → include/libipc/tls_pointer.h
@@ -4,8 +4,7 @@
 #include <utility>  // std::forward
 #include <cstddef>  // std::size_t
 
-#include "export.h"
-#include "platform/detail.h"
+#include "libipc/export.h"
 
 namespace ipc {
 namespace tls {
@@ -69,7 +68,7 @@ class pointer : public key_info {
     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 @@ class pointer : public key_info {
     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;
             }

diff --git a/include/waiter.h → include/libipc/waiter.h b/include/waiter.h → include/libipc/waiter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "export.h"
-#include "def.h"
+#include "libipc/export.h"
+#include "libipc/def.h"
 
 namespace ipc {
 

diff --git a/src/CMakeLists.txt b/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)

diff --git a/src/buffer.cpp b/src/buffer.cpp
@@ -1,5 +1,5 @@
-#include "buffer.h"
-#include "pimpl.h"
+#include "libipc/buffer.h"
+#include "libipc/utility/pimpl.h"
 
 #include <cstring>
 

diff --git a/src/ipc.cpp b/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 "shm.h"
-#include "tls_pointer.h"
-#include "pool_alloc.h"
-#include "queue.h"
-#include "policy.h"
-#include "rw_lock.h"
-#include "log.h"
-#include "id_pool.h"
+#include "libipc/ipc.h"
+#include "libipc/def.h"
+#include "libipc/shm.h"
+#include "libipc/tls_pointer.h"
+#include "libipc/pool_alloc.h"
+#include "libipc/queue.h"
+#include "libipc/policy.h"
+#include "libipc/rw_lock.h"
 
-#include "memory/resource.h"
+#include "libipc/utility/log.h"
+#include "libipc/utility/id_pool.h"
 
-#include "platform/detail.h"
-#include "platform/waiter_wrapper.h"
+#include "libipc/memory/resource.h"
 
-#include "circ/elem_array.h"
+#include "libipc/platform/detail.h"
+#include "libipc/platform/waiter_wrapper.h"
+
+#include "libipc/circ/elem_array.h"
 
 namespace {
 

diff --git a/src/circ/elem_array.h → src/libipc/circ/elem_array.h b/src/circ/elem_array.h → 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 "platform/detail.h"
+#include "libipc/circ/elem_def.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace circ {

diff --git a/src/circ/elem_def.h → src/libipc/circ/elem_def.h b/src/circ/elem_def.h → 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 {

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

diff --git a/src/memory/allocator_wrapper.h → src/libipc/memory/allocator_wrapper.h b/src/memory/allocator_wrapper.h → 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 @@ class allocator_wrapper {
 
     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);
     }
 };
 

diff --git a/src/memory/resource.h → src/libipc/memory/resource.h b/src/memory/resource.h → 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 "memory/wrapper.h"
-#include "platform/detail.h"
+#include "libipc/memory/alloc.h"
+#include "libipc/memory/wrapper.h"
+#include "libipc/platform/detail.h"
 
 namespace ipc {
 namespace mem {

diff --git a/src/memory/wrapper.h → src/libipc/memory/wrapper.h b/src/memory/wrapper.h → 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 "rw_lock.h"
-#include "tls_pointer.h"
-#include "concept.h"
+#include "libipc/def.h"
+#include "libipc/rw_lock.h"
+#include "libipc/tls_pointer.h"
+#include "libipc/pool_alloc.h"
 
-#include "memory/alloc.h"
-#include "platform/detail.h"
+#include "libipc/utility/concept.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_);
         }
 

diff --git a/src/platform/detail.h → src/libipc/platform/detail.h b/src/platform/detail.h → src/libipc/platform/detail.h
diff --git a/src/platform/get_sa.h → src/libipc/platform/get_sa.h b/src/platform/get_sa.h → src/libipc/platform/get_sa.h
diff --git a/src/platform/shm_linux.cpp → src/libipc/platform/shm_linux.cpp b/src/platform/shm_linux.cpp → 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 "log.h"
-#include "pool_alloc.h"
+#include "libipc/shm.h"
+#include "libipc/def.h"
+#include "libipc/pool_alloc.h"
 
-#include "memory/resource.h"
+#include "libipc/utility/log.h"
+#include "libipc/memory/resource.h"
 
 namespace {
 

diff --git a/src/platform/shm_win.cpp → src/libipc/platform/shm_win.cpp b/src/platform/shm_win.cpp → src/libipc/platform/shm_win.cpp
@@ -1,17 +1,17 @@
-#include "shm.h"
 
 #include <Windows.h>
 
 #include <string>
 #include <utility>
 
-#include "def.h"
-#include "log.h"
-#include "pool_alloc.h"
+#include "libipc/shm.h"
+#include "libipc/def.h"
+#include "libipc/pool_alloc.h"
 
-#include "platform/to_tchar.h"
-#include "platform/get_sa.h"
-#include "memory/resource.h"
+#include "libipc/utility/log.h"
+#include "libipc/platform/to_tchar.h"
+#include "libipc/platform/get_sa.h"
+#include "libipc/memory/resource.h"
 
 namespace {