Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fixed thread_safe_index::remove and thread_safe_index::modify

Browse source
This commit is contained in:
Anton Shkinder 2019-02-11 11:46:15 +03:00 committed by Anzhy Cherrnyavski
parent fa2eff74c2
commit b33c5bf86f
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/sidechain/include/sidechain/thread_safe_index.hpp
View file

@ -6,7 +6,8 @@
namespace sidechain { namespace sidechain {
template<class T1> template<class T1>
class thread_safe_index { class thread_safe_index
{
public: public:
@ -18,17 +19,23 @@ public:
} }
template<class T2, typename Key> template<class T2, typename Key>
void modify( const Key _key, const std::function<void( typename T1::value_type& e)>& func ) { bool modify( const Key _key, const std::function<void( typename T1::value_type& e)>& func ) {
std::lock_guard<std::recursive_mutex> locker( lock ); std::lock_guard<std::recursive_mutex> locker( lock );
const auto& obj = *find_iterator<T2>( _key ); const auto option = find_iterator<T2>( _key );
data.modify( data.iterator_to( obj ), [&func]( typename T1::value_type& obj ) { func( obj ); } ); if( !option )
return false;
data.modify( data.iterator_to( **option ), [&func]( typename T1::value_type& obj ) { func( obj ); } );
return true;
} }
template<class T2, typename Key> template<class T2, typename Key>
void remove( const Key _key ) { bool remove( const Key _key ) {
std::lock_guard<std::recursive_mutex> locker( lock ); std::lock_guard<std::recursive_mutex> locker( lock );
const auto& obj = *find_iterator<T2>( _key ); const auto option = find_iterator<T2>( _key );
data.erase( data.iterator_to( obj ) ); if( !option )
return false;
data.erase( data.iterator_to( **option ) );
return true;
} }
size_t size() { size_t size() {
@ -58,13 +65,14 @@ public:
private: private:
template<class T2, typename Key> template<class T2, typename Key>
typename T1::template index<T2>::type::iterator find_iterator( const Key _key ) { fc::optional<typename T1::template index<T2>::type::iterator> find_iterator( const Key _key ) {
auto& index = data.template get<T2>(); auto& index = data.template get<T2>();
auto it = index.find( _key ); auto it = index.find( _key );
if( it == index.end() )
return fc::optional<typename T1::template index<T2>::type::iterator>();
return it; return it;
} }
std::recursive_mutex lock; std::recursive_mutex lock;
T1 data; T1 data;