FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Tim Moore, Dereference the databaseRequest while the queue is locked. This prevents the request from being

Browse Source 
deleted at an unpredictable time within addLoadedDataToSceneGraph.
This commit is contained in:
Robert Osfield
2010-12-21 12:54:06 +00:00
parent c38a1eb56d
commit b5d4d9954a
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/osgDB/DatabasePager.cpp
View File

@@ -958,17 +958,24 @@ void DatabasePager::DatabaseThread::run()
databaseRequest->_loadedModel = loadedModel;
databaseRequest->_compileSet = compileSet;
}
// Dereference the databaseRequest while the queue is
// locked. This prevents the request from being
// deleted at an unpredictable time within
// addLoadedDataToSceneGraph.
if (loadedObjectsNeedToBeCompiled)
{
_pager->_incrementalCompileOperation->add(compileSet);
databaseRequest->_compileSet = compileSet;
_pager->_dataToCompileList->add(databaseRequest.get());
OpenThreads::ScopedLock<OpenThreads::Mutex> listLock(
_pager->_dataToCompileList->_requestMutex);
_pager->_dataToCompileList->addNoLock(databaseRequest.get());
databaseRequest = 0;
}
else
{
_pager->_dataToMergeList->add(databaseRequest.get());
OpenThreads::ScopedLock<OpenThreads::Mutex> listLock(
_pager->_dataToMergeList->_requestMutex);
_pager->_dataToMergeList->addNoLock(databaseRequest.get());
databaseRequest = 0;
}
}