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

Introduced CMake option OSG_PROVIDE_READFILE option that defaults to ON, but when switched to OFF disables the building of the osgDB::read*File() methods,

Browse Source 
forcing users to use osgDB::readRef*File() methods.  The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache.  This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero.  Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.

To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage.  The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:

    bool addChild(Node* child); // old method which can only be used with a Node*

    tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method

These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-10-22 13:42:19 +00:00
parent 79fb9abbbf
commit dd996a3289
295 changed files with 2503 additions and 2172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/osg/Config.in
View File

@@ -31,5 +31,6 @@
#cmakedefine OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION
#cmakedefine OSG_USE_UTF8_FILENAME
#cmakedefine OSG_DISABLE_MSVC_WARNINGS
#cmakedefine OSG_PROVIDE_READFILE
#endif

18
src/osg/ImageSequence.cpp
View File

@@ -191,7 +191,7 @@ void ImageSequence::addImage(osg::Image* image)
void ImageSequence::setImageToChild(int pos)
{
const osg::Image* image = (pos>=0 && pos<static_cast<int>(_imageDataList.size())) ? _imageDataList[pos]._image.get() : 0;
if (image==0) return;
@@ -223,9 +223,9 @@ void ImageSequence::setImageToChild(int pos)
OSG_INFO<<" deleting "<<_previousAppliedImageIndex<<std::endl;
--_previousAppliedImageIndex;
}
}
}
}
_previousAppliedImageIndex = pos;
@@ -275,7 +275,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
bool looping = getLoopingMode()==LOOPING;
double time = (fs->getSimulationTime() - _referenceTime)*_timeMultiplier;
bool useDirectTimeRequest = _seekTimeSet;
if (_seekTimeSet || _status==PAUSED || _status==INVALID)
{
time = _seekTime;
@@ -313,7 +313,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
{
if (!(itr->_image) && !(itr->_filename.empty()))
{
itr->_image = irh->readImageFile(itr->_filename, _readOptions.get());
itr->_image = irh->readRefImageFile(itr->_filename, _readOptions.get());
}
}
}
@@ -327,7 +327,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
{
// need to find the nearest relevant change.
if (!_imageDataList[index]._image)
{
{
if (_previousAppliedImageIndex<index)
{
OSG_DEBUG<<"ImageSequence::update(..) Moving forward by "<<index-_previousAppliedImageIndex<<std::endl;
@@ -345,7 +345,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
}
}
}
if (index>=0 && index!=_previousAppliedImageIndex)
{
setImageToChild(index);
@@ -357,7 +357,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
if (!irh) return;
bool loadDirectly = (_mode==LOAD_AND_RETAIN_IN_UPDATE_TRAVERSAL) || (_mode==LOAD_AND_DISCARD_IN_UPDATE_TRAVERSAL);
if (useDirectTimeRequest)
{
int i = osg::maximum<int>(0, int(time/_timePerImage));
@@ -368,7 +368,7 @@ void ImageSequence::update(osg::NodeVisitor* nv)
if (loadDirectly)
{
OSG_NOTICE<<"Reading file, entry="<<i<<" : _fileNames[i]="<<_imageDataList[i]._filename<<std::endl;
osg::ref_ptr<osg::Image> image = irh->readImageFile(_imageDataList[i]._filename, _readOptions.get());
osg::ref_ptr<osg::Image> image = irh->readRefImageFile(_imageDataList[i]._filename, _readOptions.get());
if (image.valid())
{
OSG_NOTICE<<" Assigning image "<<_imageDataList[i]._filename<<std::endl;