nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Erase-remove idiom in Island and Bimap to avoid invalid iterators (Nils Mangelsen)

Browse source
This commit is contained in:
quemy 2013-02-07 22:48:41 +01:00
commit d41cbbe781
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
smp/src/bimap.cpp
View file

@ -49,9 +49,9 @@ std::map<B,A> paradiseo::smp::Bimap<A,B>::getLeft() const
template<class A, class B> template<class A, class B>
void paradiseo::smp::Bimap<A,B>::removeFromRight(const A& a) void paradiseo::smp::Bimap<A,B>::removeFromRight(const A& a)
{ {
for(auto& it : leftAssociation) leftAssociation.erase(remove(leftAssociation.begin(), leftAssociation.end(),
if(it->second == a) [&](std::pair<B,A>& i) -> bool { return i->second == a; }),
leftAssociation.erase(it); leftAssociation.end());
rightAssociation.erase(a); rightAssociation.erase(a);
} }
@ -59,9 +59,9 @@ void paradiseo::smp::Bimap<A,B>::removeFromRight(const A& a)
template<class A, class B> template<class A, class B>
void paradiseo::smp::Bimap<A,B>::removeFromLeft(const B& b) void paradiseo::smp::Bimap<A,B>::removeFromLeft(const B& b)
{ {
for(auto& it : rightAssociation) rightAssociation.erase(remove(rightAssociation.begin(), rightAssociation.end(),
if(it->second == b) [&](std::pair<A,B>& i) -> bool { return i->second == b; }),
rightAssociation.erase(it); rightAssociation.end());
leftAssociation.erase(b); leftAssociation.erase(b);
} }

10
smp/src/island.cpp
View file

@ -117,12 +117,12 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::send(eoSelect<EOT>& _select)
for(auto& indi : migPop) for(auto& indi : migPop)
baseMigPop.push_back(std::move(convertToBase(indi))); baseMigPop.push_back(std::move(convertToBase(indi)));
//std::cout << "On envoie de l'île : " << migPop << std::endl;
// Delete delivered messages // Delete delivered messages
for(auto it = sentMessages.begin(); it != sentMessages.end(); it++) sentMessages.erase(std::remove_if(sentMessages.begin(), sentMessages.end(),
if(!it->joinable()) [&](std::thread& i) -> bool
sentMessages.erase(it); { return !i.joinable(); }
),
sentMessages.end());
sentMessages.push_back(std::thread(&IslandModel<bEOT>::update, model, std::move(baseMigPop), this)); sentMessages.push_back(std::thread(&IslandModel<bEOT>::update, model, std::move(baseMigPop), this));
} }

1
smp/src/island.h
View file

@ -35,6 +35,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <utility> #include <utility>
#include <atomic> #include <atomic>
#include <type_traits> #include <type_traits>
#include <algorithm>
#include <eoEvalFunc.h> #include <eoEvalFunc.h>
#include <eoSelect.h> #include <eoSelect.h>