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

Added reporting of possible deadlock of paging thread

Browse Source
This commit is contained in:
Robert Osfield
2010-06-16 15:53:57 +00:00
parent 80389a4a13
commit f97c2b65b3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgDB/DatabasePager.cpp
View File

@@ -1687,6 +1687,9 @@ void DatabasePager::updateSceneGraph(const osg::FrameStamp& frameStamp)
{
// check threads to see which are active and how long the active ones have been working in their current iteration.
double timeToSuspectADeadlock = 1.0;
bool possibleDeadLock = false;
unsigned int numThreadsActive = 0;
for(DatabaseThreadList::iterator itr = _databaseThreads.begin(); itr != _databaseThreads.end(); ++itr)
{
@@ -1694,12 +1697,16 @@ void DatabasePager::updateSceneGraph(const osg::FrameStamp& frameStamp)
if (thread->getActive())
{
++numThreadsActive;
if (thread->getTimeSinceStartOfIteration()>timeToSuspectADeadlock)
{
possibleDeadLock = true;
}
}
}
if (numThreadsActive>0)
if (possibleDeadLock && numThreadsActive>0)
{
OSG_NOTICE<<"DatabasePager::updateSceneGraph()"<<std::endl;
OSG_NOTICE<<"DatabasePager::updateSceneGraph() possibleDeadLock="<<possibleDeadLock<<std::endl;
for(DatabaseThreadList::iterator itr = _databaseThreads.begin(); itr != _databaseThreads.end(); ++itr)
{
DatabaseThread* thread = itr->get();