p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only meant to make the tls callbacks into a list

This commit is contained in:
Josh Faust 2010-03-22 23:48:11 +00:00
parent ddb13a85cc
commit 7b680f04ec
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/roscpp/include/ros/callback_queue.h
View File

@ -45,6 +45,7 @@
#include <boost/thread/tss.hpp>
#include <list>
#include <deque>
namespace ros
{
@ -147,7 +148,8 @@ protected:
bool marked_for_removal;
};
typedef std::list<CallbackInfo> L_CallbackInfo;
L_CallbackInfo callbacks_;
typedef std::deque<CallbackInfo> D_CallbackInfo;
D_CallbackInfo callbacks_;
boost::mutex mutex_;
boost::condition_variable condition_;

4
core/roscpp/src/libros/callback_queue.cpp
View File

@ -166,7 +166,7 @@ void CallbackQueue::removeByID(uint64_t removal_id)
{
boost::unique_lock<boost::shared_mutex> rw_lock(id_info->calling_rw_mutex);
boost::mutex::scoped_lock lock(mutex_);
L_CallbackInfo::iterator it = callbacks_.begin();
D_CallbackInfo::iterator it = callbacks_.begin();
for (; it != callbacks_.end();)
{
CallbackInfo& info = *it;
@ -236,7 +236,7 @@ void CallbackQueue::callOne(ros::WallDuration timeout)
}
}
L_CallbackInfo::iterator it = callbacks_.begin();
D_CallbackInfo::iterator it = callbacks_.begin();
for (; it != callbacks_.end();)
{
CallbackInfo& info = *it;