Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop custom implementation of boost::condition_variable to fix busy-wait spinning #1878

Merged
merged 13 commits into from
Feb 8, 2020
Merged

Drop custom implementation of boost::condition_variable to fix busy-wait spinning #1878

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2577130
roscpp: fix potential busy-wait loop caused by backported Boost condi…
meyerj Nov 2, 2018
b4e7cbc
roscpp: use boost::condition_variable::wait_for() instead of deprecat…
meyerj Dec 5, 2018
be288e2
roscpp: do not use boost_161_condition_variable.h on Windows (untested)
meyerj Dec 11, 2018
9d2715d
roscpp: remove specialized implementation of TimerManager<T,D,E>::thr…
meyerj Dec 14, 2018
f6a05e3
fix namespaces
Feb 25, 2019
dd503e2
add more explicit namespaces
ahoarau Feb 26, 2019
48b3f6b
add missing ns
Feb 26, 2019
dfbf726
roscpp: fixed Boost version check in CMakeLists.txt
meyerj Apr 5, 2019
b9e8f3a
roscpp: replace ROSCPP_BOOST_CONDITION_VARIABLE and ROSCPP_BOOST_COND…
meyerj Apr 12, 2019
8e44572
Remove copy of boost::condition_variable implementation from Boost 1.…
meyerj Feb 5, 2020
7d470f3
Revert some changes in include directives and in CMakeLists.txt to mi…
meyerj Feb 5, 2020
2a67cf6
use wait_for(), remove TimerManagerTraits
dirk-thomas Feb 6, 2020
5d72aa2
Revert "use wait_for(), remove TimerManagerTraits"
dirk-thomas Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions clients/roscpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,22 @@ list(GET roscpp_VERSION_LIST 0 roscpp_VERSION_MAJOR)
list(GET roscpp_VERSION_LIST 1 roscpp_VERSION_MINOR)
list(GET roscpp_VERSION_LIST 2 roscpp_VERSION_PATCH)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)

find_package(Boost REQUIRED COMPONENTS chrono filesystem system)

# Make sure we use CLOCK_MONOTONIC for the condition variable wait_for if not Apple.
if(NOT APPLE AND NOT WIN32)
if(Boost_VERSION LESS 106100)
message(FATAL_ERROR "${PROJECT_NAME} requires Boost 1.61 or above.")
endif()
if(Boost_VERSION LESS 106700)
# CLOCK_MONOTONIC became the default in Boost 1.67:
# https://github.com/boostorg/thread/commit/1e84b978b2bb0aae830cc14533dea3b7ddda5cde
add_definitions(-DBOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC)
endif()
endif()

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/ros/common.h.in ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros/common.h)

include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
# this is needed for use within a bazel workspace. See #1548 for details.
include_directories(${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION})
Expand Down
23 changes: 0 additions & 23 deletions clients/roscpp/include/boost_161_condition_variable.h
View file
Open in desktop

This file was deleted.

Loading