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

Improvements to DatabasePager

Browse Source
This commit is contained in:
Robert Osfield
2003-10-10 19:25:14 +00:00
parent b9423da386
commit fad832425f
4 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/NodeVisitor
View File

@@ -243,7 +243,7 @@ class SG_EXPORT NodeVisitor : public virtual Referenced
class DatabaseRequestHandler : public osg::Referenced
{
public:
virtual void requestNodeFile(const std::string& fileName,osg::Group* group) = 0;
virtual void requestNodeFile(const std::string& fileName,osg::Group* group, float priority, const FrameStamp* framestamp) = 0;
protected:
virtual ~DatabaseRequestHandler() {}

15
include/osgDB/DatabasePager
View File

@@ -38,7 +38,7 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
DatabasePager();
/** Add a request to load a node file to end the the database request list.*/
virtual void requestNodeFile(const std::string& fileName,osg::Group* group);
virtual void requestNodeFile(const std::string& fileName,osg::Group* group, float priority, const osg::FrameStamp* framestamp);
/** run does the database paging.*/
virtual void run();
@@ -113,17 +113,18 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
typedef std::set<unsigned int> ActiveGraphicsContexts;
protected :
virtual ~DatabasePager();
struct DatabaseRequest : public osg::Referenced
{
DatabaseRequest():
_numOfRequests(0)
{}
std::string _fileName;
double _timestampFirstRequest;
float _priorityFirstRequest;
double _timestampLastRequest;
float _priorityLastRequest;
unsigned int _numOfRequests;
osg::ref_ptr<osg::Group> _groupForAddingLoadedSubgraph;
osg::ref_ptr<osg::Node> _loadedModel;
@@ -133,6 +134,10 @@ class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandl
typedef std::vector< osg::ref_ptr<DatabaseRequest> > DatabaseRequestList;
protected :
virtual ~DatabasePager();
DatabaseRequestList _fileRequestList;
OpenThreads::Mutex _fileRequestListMutex;

5
src/osg/PagedLOD.cpp
View File

@@ -57,8 +57,9 @@ void PagedLOD::traverse(NodeVisitor& nv)
// now request the loading of the next unload child.
if (nv.getDatabaseRequestHandler() && numChildren<_fileNameList.size())
{
//std::cout<<" requesting child "<<_fileNameList[numChildren]<<std::endl;
nv.getDatabaseRequestHandler()->requestNodeFile(_fileNameList[numChildren],this);
float priority = (_rangeList[numChildren].second-distance)/(_rangeList[numChildren].second-_rangeList[numChildren].first);
//std::cout<<" requesting child "<<_fileNameList[numChildren]<<" priotity = "<<priority<<std::endl;
nv.getDatabaseRequestHandler()->requestNodeFile(_fileNameList[numChildren],this,priority,nv.getFrameStamp());
}

43
src/osgDB/DatabasePager.cpp
View File

@@ -43,9 +43,11 @@ DatabasePager::~DatabasePager()
}
void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* group)
void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* group, float priority, const osg::FrameStamp* framestamp)
{
double timestamp = framestamp?framestamp->getReferenceTime():0.0;
// search to see if filename already exist in the file loaded list.
bool foundEntry = false;
@@ -58,6 +60,8 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
if ((*litr)->_fileName==fileName)
{
foundEntry = true;
(*litr)->_timestampLastRequest = timestamp;
(*litr)->_priorityLastRequest = priority;
++((*litr)->_numOfRequests);
}
}
@@ -75,6 +79,8 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
if ((*litr)->_fileName==fileName)
{
foundEntry = true;
(*litr)->_timestampLastRequest = timestamp;
(*litr)->_priorityLastRequest = priority;
++((*litr)->_numOfRequests);
}
}
@@ -96,6 +102,8 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
if ((*ritr)->_fileName==fileName)
{
foundEntry = true;
(*ritr)->_timestampLastRequest = timestamp;
(*ritr)->_priorityLastRequest = priority;
++((*ritr)->_numOfRequests);
}
}
@@ -105,6 +113,10 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
osg::ref_ptr<DatabaseRequest> databaseRequest = new DatabaseRequest;
databaseRequest->_fileName = fileName;
databaseRequest->_timestampFirstRequest = timestamp;
databaseRequest->_priorityFirstRequest = priority;
databaseRequest->_timestampLastRequest = timestamp;
databaseRequest->_priorityLastRequest = priority;
databaseRequest->_groupForAddingLoadedSubgraph = group;
_fileRequestList.push_back(databaseRequest);
@@ -199,6 +211,17 @@ public:
};
struct SortFileRequestFunctor
{
bool operator() (const osg::ref_ptr<DatabasePager::DatabaseRequest>& lhs,const osg::ref_ptr<DatabasePager::DatabaseRequest>& rhs) const
{
if (lhs->_timestampLastRequest>rhs->_timestampLastRequest) return true;
else if (lhs->_timestampLastRequest<rhs->_timestampLastRequest) return false;
else return (lhs->_priorityLastRequest>rhs->_priorityLastRequest);
}
};
void DatabasePager::run()
{
osg::notify(osg::NOTICE)<<"DatabasePager::run()"<<std::endl;
@@ -231,7 +254,11 @@ void DatabasePager::run()
// get the front of the file request list.
_fileRequestListMutex.lock();
if (!_fileRequestList.empty()) databaseRequest = _fileRequestList.front();
if (!_fileRequestList.empty())
{
std::sort(_fileRequestList.begin(),_fileRequestList.end(),SortFileRequestFunctor());
databaseRequest = _fileRequestList.front();
}
_fileRequestListMutex.unlock();
if (databaseRequest.valid())
@@ -504,7 +531,11 @@ void DatabasePager::compileRenderingObjects(osg::State& state, double& available
// get the first compileable entry.
_dataToCompileListMutex.lock();
if (!_dataToCompileList.empty()) databaseRequest = _dataToCompileList.front();
if (!_dataToCompileList.empty())
{
std::sort(_dataToCompileList.begin(),_dataToCompileList.end(),SortFileRequestFunctor());
databaseRequest = _dataToCompileList.front();
}
_dataToCompileListMutex.unlock();
// while there are valid databaseRequest's in the to compile list and there is
@@ -576,7 +607,11 @@ void DatabasePager::compileRenderingObjects(osg::State& state, double& available
_dataToCompileList.erase(_dataToCompileList.begin());
if (!_dataToCompileList.empty()) databaseRequest = _dataToCompileList.front();
if (!_dataToCompileList.empty())
{
std::sort(_dataToCompileList.begin(),_dataToCompileList.end(),SortFileRequestFunctor());
databaseRequest = _dataToCompileList.front();
}
else databaseRequest = 0;
_dataToCompileListMutex.unlock();