Skip to content

Commit

Permalink
Adapting to new module structure, fixing build system, general cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@hkaiser
hkaiser committed Mar 27, 2021
1 parent 13bad85 commit 8ede429
Show file tree
Hide file tree
Showing 63 changed files with 1,018 additions and 7,895 deletions.
1 change: 1 addition & 0 deletions .jenkins/lsu/env-gcc-9.sh
View file
Expand Up @@ -18,3 +18,4 @@ configure_extra_options+=" -DHPX_WITH_MALLOC=system"
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS=ON"
configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON"
configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON"
configure_extra_options+=" -DHPX_LIBCDS_WITH_LIBCDS=ON"
15 changes: 0 additions & 15 deletions CMakeLists.txt
View file
Expand Up @@ -1033,21 +1033,6 @@ if(HPX_WITH_APEX)
)
endif()

# LibCDS option
hpx_option(HPX_WITH_LIBCDS BOOL "Enable LibCDS support." OFF)
if(HPX_WITH_LIBCDS)
hpx_option(
HPX_WITH_LIBCDS_GIT_REPOSITORY STRING
"Define the LibCDS git repository to use."
https://github.com/khizmax/libcds.git CATEGORY "Thread Manager" ADVANCED
)
hpx_option(
HPX_WITH_LIBCDS_GIT_TAG STRING "Define the LibCDS git tag to use." hpx-1.5
CATEGORY "Thread Manager" ADVANCED
)
hpx_add_config_define(HPX_HAVE_LIBCDS)
endif()

hpx_option(
HPX_WITH_PAPI BOOL "Enable the PAPI based performance counter." OFF
CATEGORY "Profiling"
Expand Down
47 changes: 0 additions & 47 deletions cmake/HPX_SetupLibCDS.cmake
View file

This file was deleted.

22 changes: 1 addition & 21 deletions libs/core/coroutines/include/hpx/coroutines/coroutine.hpp
View file
Expand Up @@ -96,17 +96,7 @@ namespace hpx { namespace threads { namespace coroutines {
return impl_.set_thread_data(data);
}

#if defined(HPX_HAVE_LIBCDS)
std::size_t get_libcds_data() const
{
return impl_.get_libcds_data();
}

std::size_t set_libcds_data(std::size_t data)
{
return impl_.set_libcds_data(data);
}

#if defined(HPX_HAVE_MODULE_LIBCDS)
std::size_t get_libcds_hazard_pointer_data() const
{
return impl_.get_libcds_hazard_pointer_data();
Expand All @@ -116,16 +106,6 @@ namespace hpx { namespace threads { namespace coroutines {
{
return impl_.set_libcds_hazard_pointer_data(data);
}

std::size_t get_libcds_dynamic_hazard_pointer_data() const
{
return impl_.get_libcds_dynamic_hazard_pointer_data();
}

std::size_t set_libcds_dynamic_hazard_pointer_data(std::size_t data)
{
return impl_.set_libcds_dynamic_hazard_pointer_data(data);
}
#endif

void rebind(functor_type&& f, thread_id_type id)
Expand Down
44 changes: 6 additions & 38 deletions libs/core/coroutines/include/hpx/coroutines/detail/context_base.hpp
View file
Expand Up @@ -86,10 +86,8 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
#else
, m_thread_data(0)
#endif
#if defined(HPX_HAVE_LIBCDS)
, libcds_data_(0)
#if defined(HPX_HAVE_MODULE_LIBCDS)
, libcds_hazard_pointer_data_(0)
, libcds_dynamic_hazard_pointer_data_(0)
#endif
, m_type_info()
, m_thread_id(id)
Expand All @@ -104,10 +102,8 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
#else
m_thread_data = 0;
#endif
#if defined(HPX_HAVE_LIBCDS)
libcds_data_ = 0;
#if defined(HPX_HAVE_MODULE_LIBCDS)
libcds_hazard_pointer_data_ = 0;
libcds_dynamic_hazard_pointer_data_ = 0;
#endif
}

Expand Down Expand Up @@ -215,10 +211,8 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
#else
m_thread_data = 0;
#endif
#if defined(HPX_HAVE_LIBCDS)
libcds_data_ = 0;
#if defined(HPX_HAVE_MODULE_LIBCDS)
libcds_hazard_pointer_data_ = 0;
libcds_dynamic_hazard_pointer_data_ = 0;
#endif
}

Expand All @@ -244,18 +238,7 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
#endif
}

#if defined(HPX_HAVE_LIBCDS)
std::size_t get_libcds_data() const
{
return libcds_data_;
}

std::size_t set_libcds_data(std::size_t data)
{
std::swap(data, libcds_data_);
return data;
}

#if defined(HPX_HAVE_MODULE_LIBCDS)
std::size_t get_libcds_hazard_pointer_data() const
{
return libcds_hazard_pointer_data_;
Expand All @@ -266,17 +249,6 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
std::swap(data, libcds_hazard_pointer_data_);
return data;
}

std::size_t get_libcds_dynamic_hazard_pointer_data() const
{
return libcds_dynamic_hazard_pointer_data_;
}

std::size_t set_libcds_dynamic_hazard_pointer_data(std::size_t data)
{
std::swap(data, libcds_dynamic_hazard_pointer_data_);
return data;
}
#endif

#if defined(HPX_HAVE_THREAD_LOCAL_STORAGE)
Expand Down Expand Up @@ -335,10 +307,8 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
#else
HPX_ASSERT(m_thread_data == 0);
#endif
#if defined(HPX_HAVE_LIBCDS)
HPX_ASSERT(libcds_data_ == 0);
#if defined(HPX_HAVE_MODULE_LIBCDS)
HPX_ASSERT(libcds_hazard_pointer_data_ == 0);
HPX_ASSERT(libcds_dynamic_hazard_pointer_data_ == 0);
#endif
// NOLINTNEXTLINE(bugprone-throw-keyword-missing)
m_type_info = std::exception_ptr();
Expand Down Expand Up @@ -401,10 +371,8 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
#else
mutable std::size_t m_thread_data;
#endif
#if defined(HPX_HAVE_LIBCDS)
mutable std::size_t libcds_data_;
#if defined(HPX_HAVE_MODULE_LIBCDS)
mutable std::size_t libcds_hazard_pointer_data_;
mutable std::size_t libcds_dynamic_hazard_pointer_data_;
#endif

// This is used to generate a meaningful exception trace.
Expand Down
9 changes: 1 addition & 8 deletions libs/core/coroutines/include/hpx/coroutines/detail/coroutine_self.hpp
View file
Expand Up @@ -129,17 +129,10 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
virtual std::size_t get_thread_data() const = 0;
virtual std::size_t set_thread_data(std::size_t data) = 0;

#if defined(HPX_HAVE_LIBCDS)
virtual std::size_t get_libcds_data() const = 0;
virtual std::size_t set_libcds_data(std::size_t data) = 0;

#if defined(HPX_HAVE_MODULE_LIBCDS)
virtual std::size_t get_libcds_hazard_pointer_data() const = 0;
virtual std::size_t set_libcds_hazard_pointer_data(
std::size_t data) = 0;

virtual std::size_t get_libcds_dynamic_hazard_pointer_data() const = 0;
virtual std::size_t set_libcds_dynamic_hazard_pointer_data(
std::size_t data) = 0;
#endif

virtual tss_storage* get_thread_tss_data() = 0;
Expand Down
25 changes: 1 addition & 24 deletions libs/core/coroutines/include/hpx/coroutines/detail/coroutine_stackful_self.hpp
View file
Expand Up @@ -81,18 +81,7 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
return pimpl_->set_thread_data(data);
}

#if defined(HPX_HAVE_LIBCDS)
std::size_t get_libcds_data() const override
{
HPX_ASSERT(pimpl_);
return pimpl_->get_libcds_data();
}
std::size_t set_libcds_data(std::size_t data) override
{
HPX_ASSERT(pimpl_);
return pimpl_->set_libcds_data(data);
}

#if defined(HPX_HAVE_MODULE_LIBCDS)
std::size_t get_libcds_hazard_pointer_data() const override
{
HPX_ASSERT(pimpl_);
Expand All @@ -103,18 +92,6 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
HPX_ASSERT(pimpl_);
return pimpl_->set_libcds_hazard_pointer_data(data);
}

std::size_t get_libcds_dynamic_hazard_pointer_data() const override
{
HPX_ASSERT(pimpl_);
return pimpl_->get_libcds_dynamic_hazard_pointer_data();
}
std::size_t set_libcds_dynamic_hazard_pointer_data(
std::size_t data) override
{
HPX_ASSERT(pimpl_);
return pimpl_->set_libcds_dynamic_hazard_pointer_data(data);
}
#endif

tss_storage* get_thread_tss_data() override
Expand Down
25 changes: 1 addition & 24 deletions libs/core/coroutines/include/hpx/coroutines/detail/coroutine_stackless_self.hpp
View file
Expand Up @@ -73,18 +73,7 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
return pimpl_->set_thread_data(data);
}

#if defined(HPX_HAVE_LIBCDS)
std::size_t get_libcds_data() const override
{
HPX_ASSERT(pimpl_);
return pimpl_->get_libcds_data();
}
std::size_t set_libcds_data(std::size_t data) override
{
HPX_ASSERT(pimpl_);
return pimpl_->set_libcds_data(data);
}

#if defined(HPX_HAVE_MODULE_LIBCDS)
std::size_t get_libcds_hazard_pointer_data() const override
{
HPX_ASSERT(pimpl_);
Expand All @@ -95,18 +84,6 @@ namespace hpx { namespace threads { namespace coroutines { namespace detail {
HPX_ASSERT(pimpl_);
return pimpl_->set_libcds_hazard_pointer_data(data);
}

std::size_t get_libcds_dynamic_hazard_pointer_data() const override
{
HPX_ASSERT(pimpl_);
return pimpl_->get_libcds_dynamic_hazard_pointer_data();
}
std::size_t set_libcds_dynamic_hazard_pointer_data(
std::size_t data) override
{
HPX_ASSERT(pimpl_);
return pimpl_->set_libcds_dynamic_hazard_pointer_data(data);
}
#endif

tss_storage* get_thread_tss_data() override
Expand Down
28 changes: 2 additions & 26 deletions libs/core/coroutines/include/hpx/coroutines/stackless_coroutine.hpp
View file
Expand Up @@ -121,18 +121,7 @@ namespace hpx { namespace threads { namespace coroutines {
#endif
}

#if defined(HPX_HAVE_LIBCDS)
std::size_t get_libcds_data() const
{
return libcds_data_;
}

std::size_t set_libcds_data(std::size_t data)
{
std::swap(data, libcds_data_);
return data;
}

#if defined(HPX_HAVE_MODULE_LIBCDS)
std::size_t get_libcds_hazard_pointer_data() const
{
return libcds_hazard_pointer_data_;
Expand All @@ -143,17 +132,6 @@ namespace hpx { namespace threads { namespace coroutines {
std::swap(data, libcds_hazard_pointer_data_);
return data;
}

std::size_t get_libcds_dynamic_hazard_pointer_data() const
{
return libcds_dynamic_hazard_pointer_data_;
}

std::size_t set_libcds_dynamic_hazard_pointer_data(std::size_t data)
{
std::swap(data, libcds_dynamic_hazard_pointer_data_);
return data;
}
#endif

#if defined(HPX_HAVE_THREAD_LOCAL_STORAGE)
Expand Down Expand Up @@ -258,10 +236,8 @@ namespace hpx { namespace threads { namespace coroutines {
mutable std::size_t thread_data_;
#endif
std::size_t continuation_recursion_count_;
#if defined(HPX_HAVE_LIBCDS)
mutable std::size_t libcds_data_;
#if defined(HPX_HAVE_MODULE_LIBCDS)
mutable std::size_t libcds_hazard_pointer_data_;
mutable std::size_t libcds_dynamic_hazard_pointer_data_;
#endif
};

Expand Down
7 changes: 1 addition & 6 deletions libs/core/threading_base/include/hpx/threading_base/thread_data.hpp
View file
Expand Up @@ -564,15 +564,10 @@ namespace hpx { namespace threads {
virtual std::size_t get_thread_data() const = 0;
virtual std::size_t set_thread_data(std::size_t data) = 0;

#if defined(HPX_HAVE_LIBCDS)
virtual std::size_t get_libcds_data() const = 0;
virtual std::size_t set_libcds_data(std::size_t data) = 0;
#if defined(HPX_HAVE_MODULE_LIBCDS)
virtual std::size_t get_libcds_hazard_pointer_data() const = 0;
virtual std::size_t set_libcds_hazard_pointer_data(
std::size_t data) = 0;
virtual std::size_t get_libcds_dynamic_hazard_pointer_data() const = 0;
virtual std::size_t set_libcds_dynamic_hazard_pointer_data(
std::size_t data) = 0;
#endif

virtual void rebind(thread_init_data& init_data) = 0;
Expand Down

0 comments on commit 8ede429

Please sign in to comment.