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

Add SteadyTimer #1014

Merged
merged 11 commits into from
Jul 19, 2017
Merged

Add SteadyTimer #1014

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
31e90c2
add SteadyTimer
flixr Mar 8, 2017
29c2116
fix timer_manager to really use a steady clock when needed
flixr Mar 6, 2017
1dbf8fa
add tests for SteadyTimer
flixr Mar 8, 2017
f62a3f2
[test] add -pthread to make some tests compile
flixr Mar 8, 2017
4fb7c1f
use SteadyTime for some timeouts
flixr Feb 26, 2017
d047af7
add some checks to make sure the backported boost headers are include…
flixr Mar 9, 2017
fc5c402
specialize TimerManager threadFunc for SteadyTimer
flixr Mar 29, 2017
1dd69de
Revert "[test] add -pthread to make some tests compile"
flixr May 16, 2017
6edc677
set minimum version for rostime
dirk-thomas Jul 19, 2017
f4f14d4
mostly spaces
dirk-thomas Jul 19, 2017
731a424
Merge pull request #1 from ros/steady_timer2
flixr Jul 19, 2017
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
3 changes: 2 additions & 1 deletion clients/roscpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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 signals filesystem system)
find_package(Boost REQUIRED COMPONENTS signals filesystem system chrono)

include_directories(include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

Expand Down Expand Up @@ -118,6 +118,7 @@ add_library(roscpp
src/libros/poll_set.cpp
src/libros/service.cpp
src/libros/this_node.cpp
src/libros/steady_timer.cpp
)

add_dependencies(roscpp ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
Expand Down
23 changes: 23 additions & 0 deletions clients/roscpp/include/boost_161_condition_variable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef BOOST_THREAD_CONDITION_VARIABLE_HPP
#define BOOST_THREAD_CONDITION_VARIABLE_HPP

// condition_variable.hpp
//
// (C) Copyright 2007 Anthony Williams
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

#include <boost/thread/detail/platform.hpp>
#if defined(BOOST_THREAD_PLATFORM_WIN32)
#include <boost/thread/win32/condition_variable.hpp>
#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
//#include <boost/thread/pthread/condition_variable.hpp>
#include "boost_161_pthread_condition_variable.h"
#else
#error "Boost threads unavailable on this platform"
#endif

#endif

Loading