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

Various improvements to the DatabasePager with the aim to achieve

Browse Source 
constant framerates and minimizing memory consumption.
This commit is contained in:
Robert Osfield
2004-09-18 19:28:45 +00:00
parent 9ac9bfa5ae
commit 8bce22343b
3 changed files with 142 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/StateAttribute
View File

@@ -20,7 +20,7 @@
#include <typeinfo>
// #define THREAD_SAFE_GLOBJECT_DELETE_LISTS 1
#define THREAD_SAFE_GLOBJECT_DELETE_LISTS 1
namespace osg {

27
include/osgDB/DatabasePager
View File

@@ -36,14 +36,14 @@ class Block: public osg::Referenced {
public:
Block():_released(false) {}
void block()
inline void block()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
if( !_released )
_cond.wait(&_mut);
}
void release()
inline void release()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
if (!_released)
@@ -53,11 +53,20 @@ class Block: public osg::Referenced {
}
}
void reset()
inline void reset()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut);
_released = false;
}
inline void set(bool doRelease)
{
if (doRelease!=_released)
{
if (doRelease) release();
else reset();
}
}
protected:
@@ -184,7 +193,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
public:
typedef std::vector< osg::ref_ptr<osg::PagedLOD> > PagedLODList;
typedef std::set< osg::ref_ptr<osg::PagedLOD> > PagedLODList;
typedef std::vector< osg::ref_ptr<osg::StateSet> > StateSetList;
typedef std::vector< osg::ref_ptr<osg::Drawable> > DrawableList;
@@ -221,6 +230,15 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
protected :
virtual ~DatabasePager();
osg::ref_ptr<Block> _databasePagerThreadBlock;
inline void updateDatabasePagerThreadBlock()
{
_databasePagerThreadBlock->set(
!_fileRequestList.empty() || !_childrenToDeleteList.empty());
}
bool _useFrameBlock;
osg::ref_ptr<Block> _frameBlock;
@@ -231,7 +249,6 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
DatabaseRequestList _fileRequestList;
OpenThreads::Mutex _fileRequestListMutex;
osg::ref_ptr<Block> _fileRequestListEmptyBlock;
DatabaseRequestList _dataToCompileList;
OpenThreads::Mutex _dataToCompileListMutex;