ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PlacementIndex corruption while deleting recursively

Browse source
This commit is contained in:
Fischlurch 2010-04-02 20:43:40 +02:00
parent 82d8d26308
commit debba6f769
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/proc/mobject/session/placement-index.cpp
View file

@ -54,6 +54,7 @@
#include "proc/mobject/session/session-impl.hpp"
#include "proc/mobject/session/scope.hpp"
#include "lib/typed-allocation-manager.hpp"
#include "lib/iter-adapter-stl.hpp"
#include "lib/util-foreach.hpp"
#include "lib/iter-source.hpp"
#include "include/logging.h"
@ -77,6 +78,8 @@ namespace session {
using std::tr1::unordered_map;
using std::tr1::unordered_multimap;
using lib::TypedAllocationManager;
using lib::iter_stl::IterSnapshot;
using lib::iter_stl::eachVal;
using std::tr1::placeholders::_1;
using std::tr1::function;
using std::tr1::bind;
@ -300,7 +303,7 @@ namespace session {
removeAll (ID scopeID)
{
remove_all_from_scope (scopeID); // recursive
remove_base_entry (scopeID); // discard storage
removeEntry (scopeID); // discard top-level
ENSURE (!util::contains(scopeTab_, scopeID));
ENSURE (!contains (scopeID));
@ -364,14 +367,24 @@ namespace session {
remove_all_from_scope (ID scopeID)
{
typedef ScopeTable::const_iterator Pos;
pair<Pos,Pos> searchRange = scopeTab_.equal_range(scopeID);
pair<Pos,Pos> scopeEntries = scopeTab_.equal_range(scopeID);
Pos first = scopeEntries.first;
Pos end = scopeEntries.second;
Pos pos = searchRange.first;
Pos end = searchRange.second;
for ( ; pos!=end; ++pos)
removeAll (pos->second); // depth-first recursion
// take a snapshot of all children to be processed recursively
typedef IterSnapshot<PID> ChildIDs;
ChildIDs child (eachVal(first,end));
scopeTab_.erase (pos,end); // assumed to be NOP for pos==end
scopeTab_.erase (first,end); // assumed to be NOP for first==end
for ( ; child; ++child )
{
remove_all_from_scope (*child); // recursive
remove_base_entry (*child); // discard storage
ENSURE (!util::contains(scopeTab_, *child));
ENSURE (!contains (*child));
}
}

4
tests/43session.tests
View file

@ -100,8 +100,6 @@ END
TEST "Placement Index" PlacementIndex_test <<END
out: ^::Placement<.+session.test.TestClip.+ use-cnt=2
out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=1
out: ^ ...1 elements at Level 1
out: ^::Placement<.+session.test.TestClip.+ use-cnt=6
out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=6
out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=6
@ -109,6 +107,8 @@ out: ^ ...2 elements at Level 2
out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=6
out: ^ ...3 elements at Level 1
out: ^::Placement<.+session.test.TestClip.+ use-cnt=2
out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=1
out: ^ ...1 elements at Level 1
out: ^...3 elements at Level 0
END