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

Moved the delete of expired subgraphs to the database thread to improve

Browse Source 
the stability of the frame rate.
This commit is contained in:
Robert Osfield
2003-08-20 07:36:47 +00:00
parent 5b7d480c0a
commit 56044e6cf7
2 changed files with 10 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/osgPlugins/txp/trPagePageManager.cpp
View File

@@ -167,22 +167,11 @@ void OSGPageManager::LoadOneTile(trpgManagedTile* tile)
tileGroup = archive->LoadTile(NULL,pageManage,tile,&parentNode);
if (tileGroup)
{
#ifdef USE_THREADLOOP_DELETE
// Make an extra reference to it because we want it back for deletion
// RO, commenting out as we don't want to do delete here, we want it to happen in the merge thread.
tileGroup->ref();
#endif
// we only put tiles with NULL parent to merge list
// others are referenced when added as a child
osgGuard g(changeListMutex);
// if(parentNode)
// parentNode->addChild(tileGroup) ;
// else
if(parentNode)
toMerge.push_back(MergePair(parentNode,tileGroup)) ;
else
toMerge.push_back(MergePair(0,tileGroup)) ;
//toMergeParent.push_back(parentNode );
}
else
{
@@ -206,7 +195,7 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
//std::cout<<"OSGPageManager::ThreadLoop()"<<std::endl;
std::vector<osg::Group *> unhook;
std::vector <osg::Group *> nextDelete;
std::vector < osg::ref_ptr<osg::Group> > nextDelete;
//bool pagingActive = false;
do
@@ -251,7 +240,8 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
pageManage->AckUnload();
}
nextDelete.clear();
//nextDelete.clear();
{
osgGuard g(changeListMutex);
// Add to the unhook list
@@ -260,25 +250,13 @@ bool OSGPageManager::ThreadLoop(PagingThread* t)
toUnhook.push_back(unhook[kk]);
}
// Also get the list of deletions while we're here
#ifdef USE_THREADLOOP_DELETE
// use the stl Luke :-) swap is constant time operation that do a = b; b.clear()
// if a is empty which is our case
nextDelete.swap(toDelete);
// toDelete.clear();
#endif
}
#ifdef USE_THREADLOOP_DELETE
// Unreference whatever we're supposed to delete
for (unsigned int gi=0;gi<nextDelete.size();gi++)
{
if( nextDelete[gi] )
{
std::cout<<"unrefing "<<nextDelete[gi]<<std::endl;
nextDelete[gi]->unref();
}
}
#endif
// unref the delete list.
nextDelete.clear();
// Now do a single load
@@ -336,7 +314,7 @@ void OSGPageManager::UpdatePositionThread(double inLocX,double inLocY)
bool OSGPageManager::MergeUpdateThread(osg::Group *rootNode)
{
std::vector<MergePair> mergeList;
std::vector<osg::Group *> unhookList;
std::vector<osg::ref_ptr<osg::Group> > unhookList;
// Make local copies of the merge and unhook lists
{
@@ -345,9 +323,6 @@ bool OSGPageManager::MergeUpdateThread(osg::Group *rootNode)
// if a is empty which is our case
mergeList.swap(toMerge);
unhookList.swap(toUnhook);
// toMerge.clear();
// toMergeParent.clear();
// toUnhook.clear();
}
// visitor to go through unhooked subgraphs to release texture objects
@@ -357,7 +332,7 @@ bool OSGPageManager::MergeUpdateThread(osg::Group *rootNode)
// Do the unhooking first
for (unsigned int ui=0;ui<unhookList.size();ui++)
{
osg::Group *unhookMe = unhookList[ui];
osg::Group *unhookMe = unhookList[ui].get();
// better safe than sorry
if(!unhookMe ) continue;
@@ -378,14 +353,12 @@ bool OSGPageManager::MergeUpdateThread(osg::Group *rootNode)
}
}
#ifdef USE_THREADLOOP_DELETE
// Put the unhooked things on the list to delete
// Append the unhooked things on to the list to delete
{
osgGuard g(changeListMutex);
for (unsigned int i = 0; i < unhookList.size();i++)
toDelete.push_back(unhookList[i]);
}
#endif
// Do the merging last
{
@@ -393,8 +366,6 @@ bool OSGPageManager::MergeUpdateThread(osg::Group *rootNode)
{
osg::Group *parent = mergeList[mi].first.get();
osg::Group *mergeMe = mergeList[mi].second.get();
// NO need for that - we only put tiles with NULL parent to merge list
// osg::Group *parent = mergeParentList[mi];
if (parent)
parent->addChild(mergeMe);
else

18
src/osgPlugins/txp/trPagePageManager.h
View File

@@ -34,15 +34,6 @@
#include <string>
// Dec 2002, Robert Osfield -> comment out now, as we actually do want to delete in the main thread
// as the deletion of the display and texture object isn't thread safe.
// Jan 2002, Robert osfield -> comment back in now, as I've changed the way the
// glDelete part is handled so that its much less likely to hit a race condtion,
// in theory its still not thread safe, but a point swap should be much faster
// and less likely to encounter a race condition on the static caches of display
// and texture object lists.
// #define USE_THREADLOOP_DELETE
namespace txp
{
/* Thread Identifier
@@ -156,15 +147,10 @@ namespace txp
// Merge list is filled in by the paging thread.
typedef std::pair< osg::ref_ptr<osg::Group> , osg::ref_ptr<osg::Group> > MergePair;
std::vector< MergePair > toMerge;
// no need for that
// std::vector<osg::Group *> toMergeParent;
// Unhook list is filled in by the paging thread
std::vector<osg::Group *> toUnhook;
std::vector< osg::ref_ptr<osg::Group> > toUnhook;
#ifdef USE_THREADLOOP_DELETE
// Main thread moves groups to the delete list as soon as they are unhooked
std::vector<osg::Group *> toDelete;
#endif
std::vector< osg::ref_ptr<osg::Group> > toDelete;
};
};