zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: objectRegistry: two-pass deletion. See #1276.

Browse Source
This commit is contained in:
mattijs
2019-06-03 13:58:51 +01:00
committed by Andrew Heather
parent 5dd6a04ff8
commit 2ce1ca48a8
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenFOAM/db/objectRegistry/objectRegistry.C
View File

@ -334,6 +334,14 @@ bool Foam::objectRegistry::checkOut(const word& key) const
void Foam::objectRegistry::clear() void Foam::objectRegistry::clear()
{ {
// Free anything owned by the registry // Free anything owned by the registry
// This needs to be done in two stages:
// - collect objects-to-be-removed
// - actually delete objects
// since the destructor of the regIOobject will actually delete its
// entry from the objectRegistry which messes up the iterator.
DynamicList<regIOobject*> owned;
for (iterator iter = begin(); iter != end(); ++iter) for (iterator iter = begin(); iter != end(); ++iter)
{ {
regIOobject* ptr = iter.val(); regIOobject* ptr = iter.val();
@ -341,17 +349,25 @@ void Foam::objectRegistry::clear()
if (ptr && ptr->ownedByRegistry()) if (ptr && ptr->ownedByRegistry())
{ {
// TBD: may wish to have ptr->clearWatches(); // TBD: may wish to have ptr->clearWatches();
if (objectRegistry::debug) if (objectRegistry::debug)
{ {
Pout<< "objectRegistry::clear : " << ptr->name() Pout<< "objectRegistry::clear : " << ptr->name()
<< " watches :" << flatOutput(ptr->watchIndices()) << nl; << " watches :" << flatOutput(ptr->watchIndices()) << nl;
} }
delete ptr;
owned.append(ptr);
} }
} }
for (regIOobject* objectPtr : owned)
{
// Make sure that the destructor of the regIOobject does a checkout
objectPtr->release();
delete objectPtr;
}
HashTable<regIOobject*>::clear(); HashTable<regIOobject*>::clear();
} }