Merge pull request #59 from mutouyun/master

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 ]
 

.gitignore

@@ -44,4 +44,7 @@ CMakeLists.txt.user*
 
 # My output files
 build
+
+# vs
+.vs
 .vscode

3rdparty/gtest/CMakeLists.txt

@@ -8,12 +8,16 @@
 # ctest.  You can select which tests to run using 'ctest -R regex'.
 # For more options, run 'ctest --help'.
 
+if (POLICY CMP0077)
+  cmake_policy(SET CMP0077 NEW)
+endif (POLICY CMP0077)
+
 # When other libraries are using a shared version of runtime libraries,
 # Google Test also has to use one.
 option(
   gtest_force_shared_crt
   "Use shared (DLL) run-time lib even when Google Test is built as static lib."
-  ON)
+  OFF)
 
 option(gtest_build_tests "Build all of gtest's own tests." OFF)
 

CMakeLists.txt

@@ -1,25 +1,48 @@
 cmake_minimum_required(VERSION 3.10)
 project(cpp-ipc)
 
-option(LIBIPC_BUILD_TESTS "Build all of libipc's own tests." OFF)
-option(LIBIPC_BUILD_DEMOS "Build all of libipc's own demos." OFF)
+option(LIBIPC_BUILD_TESTS       "Build all of libipc's own tests."                      OFF)
+option(LIBIPC_BUILD_DEMOS       "Build all of libipc's own demos."                      OFF)
+option(LIBIPC_BUILD_SHARED_LIBS "Build shared libraries (DLLs)."                        OFF)
+option(LIBIPC_USE_STATIC_CRT    "Set to ON to build with static CRT on Windows (/MT)."  OFF)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 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")
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/include)
+if (MSVC AND LIBIPC_USE_STATIC_CRT)
+    set(CompilerFlags
+        CMAKE_CXX_FLAGS
+        CMAKE_CXX_FLAGS_DEBUG
+        CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_C_FLAGS
+        CMAKE_C_FLAGS_DEBUG
+        CMAKE_C_FLAGS_RELEASE
+        )
+    foreach(CompilerFlag ${CompilerFlags})
+        string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+    endforeach()
+endif()
 
 set(LIBRARY_OUTPUT_PATH    ${CMAKE_BINARY_DIR}/bin)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 set(LIBIPC_PROJECT_DIR     ${PROJECT_SOURCE_DIR})
 
+# Unicode Support
+add_definitions(-DUNICODE -D_UNICODE)
+
 add_subdirectory(src)
 
 if (LIBIPC_BUILD_TESTS)
     set(GOOGLETEST_VERSION 1.10.0)
+    if (LIBIPC_USE_STATIC_CRT)
+        set(gtest_force_shared_crt OFF)
+    else()
+        set(gtest_force_shared_crt ON)
+    endif()
     add_subdirectory(3rdparty/gtest)
     add_subdirectory(test)
 endif()
@@ -30,6 +53,6 @@ if (LIBIPC_BUILD_DEMOS)
 endif()
 
 install(
-  DIRECTORY "include/"
-  DESTINATION "include"
+    DIRECTORY "include/"
+    DESTINATION "include"
 )

demo/msg_que/main.cpp

@@ -23,7 +23,7 @@ constexpr std::size_t const max_sz = 1024 * 16;
 std::atomic<bool> is_quit__{ false };
 std::atomic<std::size_t> size_counter__{ 0 };
 
-using msg_que_t = ipc::chan<ipc::relat::single, ipc::relat::single, ipc::trans::unicast>;
+using msg_que_t = ipc::chan<ipc::relat::single, ipc::relat::multi, ipc::trans::broadcast>;
 
 msg_que_t que__{ name__ };
 ipc::byte_t buff__[max_sz];

include/libipc/def.h

@@ -33,7 +33,7 @@ enum : std::uint32_t {
 enum : std::size_t {
     data_length     = 64,
     large_msg_limit = data_length,
-    large_msg_align = 512,
+    large_msg_align = 1024,
     large_msg_cache = 32,
 };
 

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/pool_alloc.h

@@ -94,6 +94,7 @@ inline void free(void* p, std::size_t size) {
 
 template <typename T>
 void free(T* p) {
+    if (p == nullptr) return;
     destruct(p);
     pool_alloc::free(p, sizeof(T));
 }

include/libipc/tls_pointer.h

@@ -1,15 +1,5 @@
 project(ipc)
 
-add_compile_options(-D__IPC_LIBRARY__)
-
-if(NOT MSVC)
-  add_compile_options(-fPIC)
-endif()
-
-include_directories(
-    ${LIBIPC_PROJECT_DIR}/include 
-    ${LIBIPC_PROJECT_DIR}/src)
-
 if(UNIX)
   file(GLOB SRC_FILES ${LIBIPC_PROJECT_DIR}/src/libipc/platform/*_linux.cpp)
 else()
@@ -26,14 +16,44 @@ 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()
+
+# set output directory
+set_target_properties(${PROJECT_NAME}
+	PROPERTIES
+	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
+
+# set version
+set_target_properties(${PROJECT_NAME}
+    PROPERTIES
+    VERSION 1.0.0
+    SOVERSION 1)
+
+target_include_directories(${PROJECT_NAME}
+  PUBLIC  ${LIBIPC_PROJECT_DIR}/include
+  PRIVATE ${LIBIPC_PROJECT_DIR}/src
+)
+
 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(
   TARGETS ${PROJECT_NAME}
-  DESTINATION "lib"
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
 )