FGFS-4.1/OpenSceneGraph
4
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

16
examples/osgvolume/osgvolume.cpp
View File

@@ -475,7 +475,7 @@ int main( int argc, char **argv )
std::string tranferFunctionFile;
while (arguments.read("--tf",tranferFunctionFile))
{
transferFunction = osgDB::readFile<osg::TransferFunction1D>(tranferFunctionFile);
transferFunction = osgDB::readRefFile<osg::TransferFunction1D>(tranferFunctionFile);
}
while(arguments.read("--test"))
@@ -597,7 +597,7 @@ int main( int argc, char **argv )
osg::ref_ptr<osg::Group> models;
while(arguments.read("--model",filename))
{
osg::ref_ptr<osg::Node> model = osgDB::readNodeFile(filename);
osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFile(filename);
if (model.valid())
{
if (!models) models = new osg::Group;
@@ -608,7 +608,7 @@ int main( int argc, char **argv )
osg::ref_ptr<osg::Group> hulls;
while(arguments.read("--hull",filename))
{
osg::ref_ptr<osg::Node> hull = osgDB::readNodeFile(filename);
osg::ref_ptr<osg::Node> hull = osgDB::readRefNodeFile(filename);
if (hull.valid())
{
if (!hulls) hulls = new osg::Group;
@@ -713,7 +713,7 @@ int main( int argc, char **argv )
osgDB::DirectoryContents contents = osgDB::expandWildcardsInFilename(arg);
for (unsigned int i = 0; i < contents.size(); ++i)
{
osg::Image *image = osgDB::readImageFile( contents[i] );
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile( contents[i] );
if(image)
{
@@ -725,7 +725,7 @@ int main( int argc, char **argv )
else
{
// not an option so assume string is a filename.
osg::Image *image = osgDB::readImageFile( arguments[pos] );
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile( arguments[pos] );
if(image)
{
@@ -770,7 +770,7 @@ int main( int argc, char **argv )
if (osgDB::getLowerCaseFileExtension(filename)=="dicom")
{
// not an option so assume string is a filename.
osg::Image* image = osgDB::readImageFile(filename);
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
if (image)
{
images.push_back(image);
@@ -787,13 +787,13 @@ int main( int argc, char **argv )
if (fileType == osgDB::DIRECTORY)
{
osg::Image* image = osgDB::readImageFile(filename+".dicom");
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename+".dicom");
if (image) images.push_back(image);
}
else if (fileType == osgDB::REGULAR_FILE)
{
// not an option so assume string is a filename.
osg::Image* image = osgDB::readImageFile( filename );
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile( filename );
if (image) images.push_back(image);
}
else