mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12 from robwiss/master

Browse source 
added locking to sequence_impl
This commit is contained in:
Mathieu Champlon 2015-05-23 22:16:58 +02:00
commit 0c22da9627
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/turtle/detail/sequence_impl.hpp
View file

@ -10,6 +10,7 @@
#define MOCK_SEQUENCE_IMPL_HPP_INCLUDED #define MOCK_SEQUENCE_IMPL_HPP_INCLUDED
#include "../config.hpp" #include "../config.hpp"
#include "mutex.hpp"
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <algorithm> #include <algorithm>
@ -22,24 +23,30 @@ namespace detail
class sequence_impl : private boost::noncopyable class sequence_impl : private boost::noncopyable
{ {
public: public:
sequence_impl() : mutex_( boost::make_shared< mutex >() ) {}
void add( void* e ) void add( void* e )
{ {
lock _( mutex_ );
elements_.push_back( e ); elements_.push_back( e );
} }
void remove( void* e ) void remove( void* e )
{ {
lock _( mutex_ );
elements_.erase( std::remove( elements_.begin(), elements_.erase( std::remove( elements_.begin(),
elements_.end(), e ), elements_.end() ); elements_.end(), e ), elements_.end() );
} }
bool is_valid( const void* e ) const bool is_valid( const void* e ) const
{ {
lock _( mutex_ );
return std::find( elements_.begin(), elements_.end(), e ) return std::find( elements_.begin(), elements_.end(), e )
!= elements_.end(); != elements_.end();
} }
void invalidate( const void* e ) void invalidate( const void* e )
{ {
lock _( mutex_ );
elements_type::iterator it = elements_type::iterator it =
std::find( elements_.begin(), elements_.end(), e ); std::find( elements_.begin(), elements_.end(), e );
if( it != elements_.end() ) if( it != elements_.end() )
@ -50,6 +57,8 @@ namespace detail
typedef std::vector< void* > elements_type; typedef std::vector< void* > elements_type;
elements_type elements_; elements_type elements_;
const boost::shared_ptr< mutex > mutex_;
}; };
} }
} // mock } // mock

2
include/turtle/sequence.hpp
View file

@ -10,8 +10,8 @@
#define MOCK_SEQUENCE_HPP_INCLUDED #define MOCK_SEQUENCE_HPP_INCLUDED
#include "config.hpp" #include "config.hpp"
#include "detail/sequence_impl.hpp"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include "detail/sequence_impl.hpp"
namespace mock namespace mock
{ {