Merge pull request #4 from STEllAR-GROUP/hpx_thread_pr

add hpx threading support for libcds
STEllAR-GROUP · Jul 27, 2020 · 74b8d7c · 74b8d7c
2 parents a1cb11a + 084d46a
commit 74b8d7c
Show file tree

Hide file tree

Showing 61 changed files with 999 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(POLICY CMP0042)
     cmake_policy(SET CMP0042 NEW)
 endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake" CACHE STRING "Modules for CMake" FORCE)
 include(TargetArch)
 include(CheckIncludeFileCXX)
 
@@ -21,9 +21,23 @@ option(LIBCDS_WITH_ASAN "Build ASan+UBSan instrumented code" OFF)
 option(LIBCDS_WITH_TSAN "Build TSan instrumented code" OFF)
 option(LIBCDS_ENABLE_UNIT_TEST "Enable unit test" ON)
 option(LIBCDS_ENABLE_STRESS_TEST "Enable stress test" ON)
-set(CMAKE_TARGET_ARCHITECTURE "" CACHE string "Target build architecture")
 
-find_package(Threads)
+set(CMAKE_TARGET_ARCHITECTURE "" CACHE STRING "Target build architecture")
+
+if(NOT LIBCDS_WITH_HPX)
+    find_package(Threads)
+else()
+    if(NOT LIBCDS_INSIDE_HPX)
+        find_package(HPX REQUIRED)
+        if (HPX_FOUND)
+            message(STATUS "HPX Found")
+        endif()
+    endif()
+    message(STATUS "HPX Found")
+    set(CDS_HAVE_HPX TRUE)
+    add_definitions(-DCDS_THREADING_HPX)
+    include_directories(${HPX_INCLUDE_DIRS})
+endif()
 
 if(NOT CMAKE_TARGET_ARCHITECTURE)
     target_architecture(CMAKE_TARGET_ARCHITECTURE)
@@ -185,8 +199,20 @@ if(MINGW)
     target_compile_definitions(${CDS_STATIC_LIBRARY} PRIVATE CDS_BUILD_STATIC_LIB)
 endif()
 
-target_link_libraries(${CDS_SHARED_LIBRARY} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(${CDS_STATIC_LIBRARY} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+if(NOT LIBCDS_WITH_HPX)
+    target_link_libraries(${CDS_SHARED_LIBRARY} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+    target_link_libraries(${CDS_STATIC_LIBRARY} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+else()
+    target_compile_definitions(${CDS_SHARED_LIBRARY} PUBLIC CDS_THREADING_HPX)
+    target_compile_definitions(${CDS_STATIC_LIBRARY} PUBLIC CDS_THREADING_HPX)
+    if(LIBCDS_INSIDE_HPX)
+        target_link_libraries(${CDS_SHARED_LIBRARY} PUBLIC hpx_core)
+        target_link_libraries(${CDS_STATIC_LIBRARY} PUBLIC hpx_core)
+    else()
+        target_link_libraries(${CDS_SHARED_LIBRARY} PUBLIC HPX::hpx)
+        target_link_libraries(${CDS_STATIC_LIBRARY} PUBLIC HPX::hpx)
+    endif()
+endif()
 target_include_directories(${CDS_SHARED_LIBRARY} INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
                                                             $<INSTALL_INTERFACE:include>)
 target_include_directories(${CDS_STATIC_LIBRARY} INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"

diff --git a/cds/algo/atomic.h b/cds/algo/atomic.h
@@ -37,6 +37,10 @@ namespace cds {
 namespace cxx11_atomic {
 }} // namespace cds::cxx11_atomic
 
+#if CDS_THREADING_HPX
+#   include <hpx/config.hpp>
+#endif
+
 //@cond
 #if defined(CDS_USE_BOOST_ATOMIC)
     // boost atomic

diff --git a/cds/algo/flat_combining/kernel.h b/cds/algo/flat_combining/kernel.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_ALGO_FLAT_COMBINING_KERNEL_H
 #define CDSLIB_ALGO_FLAT_COMBINING_KERNEL_H
 
+#if CDS_THREADING_HPX
+#include <hpx/thread_support/thread_specific_ptr.hpp>
+#endif
+
 #include <cds/algo/flat_combining/defs.h>
 #include <cds/algo/flat_combining/wait_strategy.h>
 
@@ -232,7 +236,11 @@ namespace cds { namespace algo {
             atomics::atomic<unsigned int>  m_nCount;    ///< Total count of combining passes. Used as an age.
             publication_record_type*    m_pHead;        ///< Head of active publication list
             publication_record_type*    m_pAllocatedHead; ///< Head of allocated publication list
+#if CDS_THREADING_HPX
+            hpx::threads::thread_specific_ptr< publication_record_type > m_pThreadRec;   ///< Thread-local publication record
+#else
             boost::thread_specific_ptr< publication_record_type > m_pThreadRec;   ///< Thread-local publication record
+#endif
             mutable global_lock_type    m_Mutex;        ///< Global mutex
             mutable stat                m_Stat;         ///< Internal statistics
             unsigned int const          m_nCompactFactor;    ///< Publication list compacting factor (the list will be compacted through \p %m_nCompactFactor combining passes)

diff --git a/cds/algo/flat_combining/wait_strategy.h b/cds/algo/flat_combining/wait_strategy.h
@@ -6,6 +6,12 @@
 #ifndef CDSLIB_ALGO_FLAT_COMBINING_WAIT_STRATEGY_H
 #define CDSLIB_ALGO_FLAT_COMBINING_WAIT_STRATEGY_H
 
+#ifdef CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#include <hpx/synchronization/spinlock.hpp>
+#include <hpx/synchronization/condition_variable.hpp>
+#endif
+
 #include <cds/algo/flat_combining/defs.h>
 #include <cds/algo/backoff_strategy.h>
 #include <mutex>
@@ -37,6 +43,18 @@ namespace cds { namespace algo { namespace flat_combining {
     */
     namespace wait_strategy {
 
+        struct thread_traits
+        {
+#ifdef CDS_THREADING_HPX
+            using mutex_type = hpx::lcos::local::mutex;
+            using condition_variable_type =  hpx::lcos::local::condition_variable;
+            using cv_status = hpx::lcos::local::cv_status;
+#else
+            using mutex_type = std::mutex;
+            using condition_variable_type =  std::condition_variable;
+            using cv_status = std::cv_status;
+#endif
+        };
         /// Empty wait strategy
         /**
             Empty wait strategy is just spinning on request field.
@@ -187,11 +205,11 @@ namespace cds { namespace algo { namespace flat_combining {
         class single_mutex_single_condvar
         {
         //@cond
-            std::mutex  m_mutex;
-            std::condition_variable m_condvar;
+            thread_traits::mutex_type  m_mutex;
+            thread_traits::condition_variable_type m_condvar;
             bool        m_wakeup;
 
-            typedef std::unique_lock< std::mutex > unique_lock;
+            typedef std::unique_lock< thread_traits::mutex_type > unique_lock;
         //@endcond
 
         public:
@@ -227,7 +245,7 @@ namespace cds { namespace algo { namespace flat_combining {
                             return true;
                         }
 
-                        bool ret = m_condvar.wait_for( lock, std::chrono::milliseconds( c_nWaitMilliseconds )) == std::cv_status::no_timeout;
+                        bool ret = m_condvar.wait_for( lock, std::chrono::milliseconds( c_nWaitMilliseconds )) == thread_traits::cv_status::no_timeout;
                         m_wakeup = false;
                         return ret;
                     }
@@ -263,10 +281,10 @@ namespace cds { namespace algo { namespace flat_combining {
         class single_mutex_multi_condvar
         {
         //@cond
-            std::mutex  m_mutex;
+            thread_traits::mutex_type m_mutex;
             bool        m_wakeup;
 
-            typedef std::unique_lock< std::mutex > unique_lock;
+            typedef std::unique_lock< thread_traits::mutex_type > unique_lock;
         //@endcond
 
         public:
@@ -281,7 +299,7 @@ namespace cds { namespace algo { namespace flat_combining {
                 struct type: public PublicationRecord
                 {
                     //@cond
-                    std::condition_variable m_condvar;
+                    thread_traits::condition_variable_type m_condvar;
                     //@endcond
                 };
             };
@@ -309,7 +327,7 @@ namespace cds { namespace algo { namespace flat_combining {
                             return true;
                         }
 
-                        bool ret = rec.m_condvar.wait_for( lock, std::chrono::milliseconds( c_nWaitMilliseconds )) == std::cv_status::no_timeout;
+                        bool ret = rec.m_condvar.wait_for( lock, std::chrono::milliseconds( c_nWaitMilliseconds )) == thread_traits::cv_status::no_timeout;
                         m_wakeup = false;
                         return ret;
                     }
@@ -343,7 +361,7 @@ namespace cds { namespace algo { namespace flat_combining {
         class multi_mutex_multi_condvar
         {
         //@cond
-            typedef std::unique_lock< std::mutex > unique_lock;
+            typedef std::unique_lock< thread_traits::mutex_type > unique_lock;
         //@endcond
         public:
             enum {
@@ -357,8 +375,8 @@ namespace cds { namespace algo { namespace flat_combining {
                 struct type: public PublicationRecord
                 {
                     //@cond
-                    std::mutex              m_mutex;
-                    std::condition_variable m_condvar;
+                    thread_traits::mutex_type              m_mutex;
+                    thread_traits::condition_variable_type m_condvar;
                     bool                    m_wakeup;
 
                     type()
@@ -386,7 +404,7 @@ namespace cds { namespace algo { namespace flat_combining {
                             return true;
                         }
 
-                        bool ret = rec.m_condvar.wait_for( lock, std::chrono::milliseconds( c_nWaitMilliseconds )) == std::cv_status::no_timeout;
+                        bool ret = rec.m_condvar.wait_for( lock, std::chrono::milliseconds( c_nWaitMilliseconds )) == thread_traits::cv_status::no_timeout;
                         rec.m_wakeup = false;
                         return ret;
                     }

diff --git a/cds/container/striped_map/boost_flat_map.h b/cds/container/striped_map/boost_flat_map.h
@@ -6,6 +6,9 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_FLAT_MAP_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::flat_map you must use boost 1.48 or above"

diff --git a/cds/container/striped_map/boost_list.h b/cds/container/striped_map/boost_list.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_LIST_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::list you must use boost 1.48 or above"

diff --git a/cds/container/striped_map/boost_map.h b/cds/container/striped_map/boost_map.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_MAP_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_MAP_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::map you must use boost 1.48 or above"

diff --git a/cds/container/striped_map/boost_slist.h b/cds/container/striped_map/boost_slist.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_SLIST_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::slist you must use boost 1.48 or above"

diff --git a/cds/container/striped_map/boost_unordered_map.h b/cds/container/striped_map/boost_unordered_map.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_MAP_BOOST_UNORDERED_MAP_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_MAP_BOOST_UNORDERED_MAP_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <cds/container/striped_set/adapter.h>
 #include <boost/unordered_map.hpp>
 

diff --git a/cds/container/striped_set/boost_flat_set.h b/cds/container/striped_set/boost_flat_set.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_FLAT_SET_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_FLAT_SET_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::flat_set you must use boost 1.48 or above"

diff --git a/cds/container/striped_set/boost_list.h b/cds/container/striped_set/boost_list.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_LIST_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::list you must use boost 1.48 or above"

diff --git a/cds/container/striped_set/boost_set.h b/cds/container/striped_set/boost_set.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_SET_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_SET_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::set you must use boost 1.48 or above"

diff --git a/cds/container/striped_set/boost_slist.h b/cds/container/striped_set/boost_slist.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_SLIST_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_SLIST_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <functional>   // ref
 #include <cds/container/striped_set/adapter.h>
 #include <boost/container/slist.hpp>

diff --git a/cds/container/striped_set/boost_stable_vector.h b/cds/container/striped_set/boost_stable_vector.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_STABLE_VECTOR_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_STABLE_VECTOR_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::stable_vector you must use boost 1.48 or above"

diff --git a/cds/container/striped_set/boost_unordered_set.h b/cds/container/striped_set/boost_unordered_set.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_UNORDERED_SET_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_UNORDERED_SET_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <cds/container/striped_set/adapter.h>
 #include <boost/unordered_set.hpp>
 

diff --git a/cds/container/striped_set/boost_vector.h b/cds/container/striped_set/boost_vector.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_CONTAINER_STRIPED_SET_BOOST_VECTOR_ADAPTER_H
 #define CDSLIB_CONTAINER_STRIPED_SET_BOOST_VECTOR_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/version.hpp>
 #if BOOST_VERSION < 104800
 #   error "For boost::container::vector you must use boost 1.48 or above"

diff --git a/cds/intrusive/fcqueue.h b/cds/intrusive/fcqueue.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_INTRUSIVE_FCQUEUE_H
 #define CDSLIB_INTRUSIVE_FCQUEUE_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <cds/algo/flat_combining.h>
 #include <cds/algo/elimination_opt.h>
 #include <cds/intrusive/options.h>

diff --git a/cds/intrusive/fcstack.h b/cds/intrusive/fcstack.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_INTRUSIVE_FCSTACK_H
 #define CDSLIB_INTRUSIVE_FCSTACK_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <cds/algo/flat_combining.h>
 #include <cds/algo/elimination_opt.h>
 #include <cds/intrusive/options.h>

diff --git a/cds/intrusive/segmented_queue.h b/cds/intrusive/segmented_queue.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_INTRUSIVE_SEGMENTED_QUEUE_H
 #define CDSLIB_INTRUSIVE_SEGMENTED_QUEUE_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <mutex>
 #include <cds/intrusive/details/base.h>
 #include <cds/details/marked_ptr.h>

diff --git a/cds/intrusive/striped_set/boost_avl_set.h b/cds/intrusive/striped_set/boost_avl_set.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_AVL_SET_ADAPTER_H
 #define CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_AVL_SET_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/intrusive/avl_set.hpp>
 #include <cds/intrusive/striped_set/adapter.h>
 

diff --git a/cds/intrusive/striped_set/boost_list.h b/cds/intrusive/striped_set/boost_list.h
@@ -6,6 +6,10 @@
 #ifndef CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_LIST_ADAPTER_H
 #define CDSLIB_INTRUSIVE_STRIPED_SET_BOOST_LIST_ADAPTER_H
 
+#if CDS_THREADING_HPX
+#include <hpx/config.hpp>
+#endif
+
 #include <boost/intrusive/list.hpp>
 #include <cds/intrusive/striped_set/adapter.h>