Merge pull request #48 from mutouyun/issue-47

Issue 47

Author: mutouyun

.github/workflows/c-cpp.yml

@@ -2,7 +2,7 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop, issue-* ]
   pull_request:
     branches: [ master, develop ]
 

CMakeLists.txt

@@ -7,7 +7,7 @@ option(LIBIPC_BUILD_DEMOS "Build all of libipc's own demos." OFF)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
 if(NOT MSVC)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
 endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/include)
@@ -19,14 +19,14 @@ set(LIBIPC_PROJECT_DIR     ${PROJECT_SOURCE_DIR})
 add_subdirectory(src)
 
 if (LIBIPC_BUILD_TESTS)
-    set(GOOGLETEST_VERSION 1.10.0)
-    add_subdirectory(3rdparty/gtest)
-    add_subdirectory(test)
+  set(GOOGLETEST_VERSION 1.10.0)
+  add_subdirectory(3rdparty/gtest)
+  add_subdirectory(test)
 endif()
 
 if (LIBIPC_BUILD_DEMOS)
-    add_subdirectory(demo/chat)
-    add_subdirectory(demo/msg_que)
+  add_subdirectory(demo/chat)
+  add_subdirectory(demo/msg_que)
 endif()
 
 install(

include/libipc/export.h

@@ -44,9 +44,11 @@
 */
 
 #ifndef IPC_EXPORT
-#if defined(__IPC_LIBRARY__)
+#if defined(LIBIPC_LIBRARY_SHARED_BUILDING__)
 #  define IPC_EXPORT IPC_DECL_EXPORT
-#else
+#elif defined(LIBIPC_LIBRARY_SHARED_USING__)
 #  define IPC_EXPORT IPC_DECL_IMPORT
+#else
+#  define IPC_EXPORT
 #endif
 #endif /*IPC_EXPORT*/

include/libipc/tls_pointer.h

@@ -1,6 +1,6 @@
 project(ipc)
 
-add_compile_options(-D__IPC_LIBRARY__)
+option(LIBIPC_BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
 
 if(NOT MSVC)
   add_compile_options(-fPIC)
@@ -26,11 +26,21 @@ file(GLOB HEAD_FILES
   ${LIBIPC_PROJECT_DIR}/src/libipc/platform/*.h
   ${LIBIPC_PROJECT_DIR}/src/libipc/utility/*.h)
 
-add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${HEAD_FILES})
+if (LIBIPC_BUILD_SHARED_LIBS)
+  add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${HEAD_FILES})
+  target_compile_definitions(${PROJECT_NAME}
+    INTERFACE
+      LIBIPC_LIBRARY_SHARED_USING__
+    PRIVATE
+      LIBIPC_LIBRARY_SHARED_BUILDING__)
+else()
+  add_library(${PROJECT_NAME} STATIC ${SRC_FILES} ${HEAD_FILES})
+endif()
+
 if(NOT MSVC)
   target_link_libraries(${PROJECT_NAME} PUBLIC
-      pthread
-      $<$<NOT:$<STREQUAL:${CMAKE_SYSTEM_NAME},Windows>>:rt>)
+    pthread
+    $<$<NOT:$<STREQUAL:${CMAKE_SYSTEM_NAME},Windows>>:rt>)
 endif()
 
 install(

src/CMakeLists.txt

@@ -13,7 +13,6 @@
 #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"
@@ -253,19 +252,6 @@ struct conn_info_head {
     ipc::waiter cc_waiter_, wt_waiter_, rd_waiter_;
     ipc::shm::handle acc_h_;
 
-    /*
-     * <Remarks> thread_local may have some bugs.
-     *
-     * <Reference>
-     * - https://sourceforge.net/p/mingw-w64/bugs/727/
-     * - https://sourceforge.net/p/mingw-w64/bugs/527/
-     * - https://github.com/Alexpux/MINGW-packages/issues/2519
-     * - https://github.com/ChaiScript/ChaiScript/issues/402
-     * - https://developercommunity.visualstudio.com/content/problem/124121/thread-local-variables-fail-to-be-initialized-when.html
-     * - https://software.intel.com/en-us/forums/intel-c-compiler/topic/684827
-    */
-    ipc::tls::pointer<ipc::unordered_map<msg_id_t, cache_t>> recv_cache_;
-
     conn_info_head(char const * name)
         : name_     {name}
         , cc_id_    {(cc_acc() == nullptr) ? 0 : cc_acc()->fetch_add(1, std::memory_order_relaxed)}
@@ -286,7 +272,8 @@ struct conn_info_head {
     }
 
     auto& recv_cache() {
-        return *recv_cache_.create_once();
+        thread_local ipc::unordered_map<msg_id_t, cache_t> tls;
+        return tls;
     }
 };
 

src/ipc.cpp

@@ -11,7 +11,6 @@
 
 #include "libipc/def.h"
 #include "libipc/rw_lock.h"
-#include "libipc/tls_pointer.h"
 #include "libipc/pool_alloc.h"
 
 #include "libipc/utility/concept.h"
@@ -155,18 +154,16 @@ class async_wrapper {
     };
 
     friend class alloc_proxy;
-
     using ref_t = alloc_proxy&;
-    using tls_t = tls::pointer<alloc_proxy>;
 
-    tls_t tls_;
     std::function<ref_t()> get_alloc_;
 
 public:
     template <typename ... P>
     async_wrapper(P ... pars) {
         get_alloc_ = [this, pars ...]()->ref_t {
-            return *tls_.create_once(this, pars ...);
+            thread_local alloc_proxy tls(pars ...);
+            return tls;
         };
     }