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/branches/OpenSceneGraph-3.4@15165 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-10-22 14:14:53 +00:00
parent 74f1838960
commit 6a67be2e32
281 changed files with 2443 additions and 2050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/osguserdata/osguserdata.cpp
View File

@@ -101,7 +101,7 @@ class GetNumeric : public osg::ValueObject::GetValueVisitor
GetNumeric():
_set(false),
_value(0) {}
virtual void apply(bool value) { _value = value; _set = true; }
virtual void apply(char value) { _value = value; _set = true; }
virtual void apply(unsigned char value) { _value = value; _set = true; }
@@ -174,7 +174,7 @@ void testResults(osg::Node* node)
OSG_NOTICE<<std::endl;
}
}
OSG_NOTICE<<std::endl<<std::endl;
}
@@ -182,14 +182,14 @@ void testResults(osg::Node* node)
int main(int argc, char** argv)
{
osg::ArgumentParser arguments(&argc, argv);
osg::ref_ptr<osg::Group> node = new osg::Group;
if (arguments.read("--MyUserDataContainer") || arguments.read("--mydc"))
{
node->setUserDataContainer(new MyNamespace::MyUserDataContainer);
}
int i = 10;
node->setUserValue("Int value",i);
@@ -216,18 +216,18 @@ int main(int argc, char** argv)
{
osgDB::writeNodeFile(*node, "results.osgt");
osg::ref_ptr<osg::Node> from_osgt = osgDB::readNodeFile("results.osgt");
osg::ref_ptr<osg::Node> from_osgt = osgDB::readRefNodeFile("results.osgt");
if (from_osgt.valid())
{
OSG_NOTICE<<std::endl<<"Testing results for values from scene graph read from .osgt file"<<std::endl;
testResults(from_osgt.get());
}
}
{
osgDB::writeNodeFile(*node, "results.osgb");
osg::ref_ptr<osg::Node> from_osgb = osgDB::readNodeFile("results.osgb");
osg::ref_ptr<osg::Node> from_osgb = osgDB::readRefNodeFile("results.osgb");
if (from_osgb.valid())
{
OSG_NOTICE<<std::endl<<"Testing results for values from scene graph read from .osgb file"<<std::endl;
@@ -238,7 +238,7 @@ int main(int argc, char** argv)
{
osgDB::writeNodeFile(*node, "results.osgx");
osg::ref_ptr<osg::Node> from_osgx = osgDB::readNodeFile("results.osgx");
osg::ref_ptr<osg::Node> from_osgx = osgDB::readRefNodeFile("results.osgx");
if (from_osgx.valid())
{
OSG_NOTICE<<std::endl<<"Testing results for values from scene graph read from .osgx file"<<std::endl;