Browse Source

关闭内联state

现版本的vs2019实现的C++20,其协程的内存布局发生了改变,导致内联state会崩溃
3.0.0
tearshark 2 years ago
parent
commit
76bd6538a9
2 changed files with 24 additions and 27 deletions
  1. 22
    25
      CMakeLists.txt
  2. 2
    2
      include/librf/src/config.h

+ 22
- 25
CMakeLists.txt View File

if(${LIBRF_COMPILER_SETTING} STREQUAL "msvc") if(${LIBRF_COMPILER_SETTING} STREQUAL "msvc")
option(OPT_INLINE_STATE "Enable Inline state" ON)
option(LIBRF_INLINE_STATE "Enable Inline state" OFF)
elseif(${LIBRF_COMPILER_SETTING} STREQUAL "clang") elseif(${LIBRF_COMPILER_SETTING} STREQUAL "clang")
option(OPT_INLINE_STATE "Enable Inline state" ON)
option(LIBRF_INLINE_STATE "Enable Inline state" OFF)
elseif(${LIBRF_COMPILER_SETTING} STREQUAL "gcc") elseif(${LIBRF_COMPILER_SETTING} STREQUAL "gcc")
option(OPT_INLINE_STATE "Enable Inline state" OFF)
option(LIBRF_INLINE_STATE "Enable Inline state" OFF)
else() else()
option(OPT_INLINE_STATE "Enable Inline state" OFF)
option(LIBRF_INLINE_STATE "Enable Inline state" OFF)
endif() endif()
option(OPT_DEBUG_COUNTER "Debug objects count" OFF)
option(OPT_KEEP_REAL_SIZE "Keep real size in queue" OFF)
option(OPT_DISABLE_MULT_THREAD "Disable multi-threaded scheduler" OFF)
option(OPT_USE_MIMALLOC "Use mimalloc" OFF)
option(OPT_DYNAMIC_LIBRARY "Use shared library" ON)
option(LIBRF_DEBUG_COUNTER "Debug objects count" OFF)
option(LIBRF_KEEP_REAL_SIZE "Keep real size in queue" OFF)
option(LIBRF_DISABLE_MULT_THREAD "Disable multi-threaded scheduler" OFF)
option(LIBRF_USE_MIMALLOC "Use mimalloc" OFF)
option(LIBRF_DYNAMIC_LIBRARY "Use shared library" ON)
option(CMAKE_ENABLE_UNIT_TEST "Enable unit test" OFF) option(CMAKE_ENABLE_UNIT_TEST "Enable unit test" OFF)
if (UNIX) if (UNIX)
if(OPT_USE_MIMALLOC)
if(LIBRF_USE_MIMALLOC)
find_package(mimalloc 1.4 REQUIRED) find_package(mimalloc 1.4 REQUIRED)
endif() endif()
#set(RESUMEF_USE_CUSTOM_SPINLOCK "std::mutex") #set(RESUMEF_USE_CUSTOM_SPINLOCK "std::mutex")
if(OPT_INLINE_STATE)
if(LIBRF_INLINE_STATE)
set(RESUMEF_INLINE_STATE 1) set(RESUMEF_INLINE_STATE 1)
endif() endif()
if(OPT_DEBUG_COUNTER)
if(LIBRF_DEBUG_COUNTER)
set(RESUMEF_DEBUG_COUNTER 1) set(RESUMEF_DEBUG_COUNTER 1)
endif() endif()
if(OPT_KEEP_REAL_SIZE)
if(LIBRF_KEEP_REAL_SIZE)
set(_WITH_LOCK_FREE_Q_KEEP_REAL_SIZE 1) set(_WITH_LOCK_FREE_Q_KEEP_REAL_SIZE 1)
endif() endif()
if(OPT_DISABLE_MULT_THREAD)
if(LIBRF_DISABLE_MULT_THREAD)
set(RESUMEF_DISABLE_MULT_THREAD 1) set(RESUMEF_DISABLE_MULT_THREAD 1)
endif() endif()
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/config.h.in
${CMAKE_SOURCE_DIR}/include/librf/src/config.h
${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_SOURCE_DIR}/include/librf/src/config.h
) )
file(GLOB_RECURSE HEADER_FILES ${CMAKE_SOURCE_DIR}/include/*.*)
file(GLOB_RECURSE SOURCE_FILES ${CMAKE_SOURCE_DIR}/source/*.*)
file(GLOB_RECURSE HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/*.*)
file(GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/source/*.*)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
if(OPT_DYNAMIC_LIBRARY)
if(LIBRF_DYNAMIC_LIBRARY)
add_library(${PROJECT_NAME} SHARED add_library(${PROJECT_NAME} SHARED
${HEADER_FILES} ${HEADER_FILES}
${SOURCE_FILES} ${SOURCE_FILES}
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/modern_cb
) )
if(OPT_USE_MIMALLOC)
if(LIBRF_USE_MIMALLOC)
set(LIB_MIMALLOC, "mimalloc") set(LIB_MIMALLOC, "mimalloc")
else() else()
set(LIB_MIMALLOC, "") set(LIB_MIMALLOC, "")
endif() endif()
if(CMAKE_ENABLE_UNIT_TEST) if(CMAKE_ENABLE_UNIT_TEST)
include_directories(
${CMAKE_SOURCE_DIR}/modern_cb
)
add_subdirectory(tutorial) add_subdirectory(tutorial)
#add_subdirectory(benchmark) #add_subdirectory(benchmark)
endif() endif()
include(${CMAKE_SOURCE_DIR}/cmake/install.cmake) include(${CMAKE_SOURCE_DIR}/cmake/install.cmake)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/librf DESTINATION include)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/librf DESTINATION include)

+ 2
- 2
include/librf/src/config.h View File



#ifndef RESUMEF_INLINE_STATE #ifndef RESUMEF_INLINE_STATE
#if defined(__clang__) || defined(_MSC_VER) #if defined(__clang__) || defined(_MSC_VER)
#define RESUMEF_INLINE_STATE 1
/* #undef RESUMEF_INLINE_STATE */
#else #else
#define RESUMEF_INLINE_STATE 0
/* #undef RESUMEF_INLINE_STATE */
#endif //defined(__clang__) || defined(_MSC_VER) #endif //defined(__clang__) || defined(_MSC_VER)
#endif //RESUMEF_INLINE_STATE #endif //RESUMEF_INLINE_STATE



Loading…
Cancel
Save