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,
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:
@@ -47,6 +47,8 @@ class OSG_EXPORT UserDataContainer : public osg::Object
|
||||
*/
|
||||
virtual void setUserData(Referenced* obj) = 0;
|
||||
|
||||
using osg::Object::setUserData;
|
||||
|
||||
/** Get user data.*/
|
||||
virtual Referenced* getUserData() = 0;
|
||||
|
||||
@@ -56,6 +58,8 @@ class OSG_EXPORT UserDataContainer : public osg::Object
|
||||
/** Add user data object. Returns the index position of object added. */
|
||||
virtual unsigned int addUserObject(Object* obj) = 0;
|
||||
|
||||
template<class T> unsigned int addUserObject(const osg::ref_ptr<T>& obj) { return addUserObject(obj.get()); }
|
||||
|
||||
/** Add element to list of user data objects.*/
|
||||
virtual void setUserObject(unsigned int i, Object* obj) = 0;
|
||||
|
||||
@@ -127,6 +131,9 @@ class OSG_EXPORT DefaultUserDataContainer : public osg::UserDataContainer
|
||||
*/
|
||||
virtual void setUserData(Referenced* obj);
|
||||
|
||||
using osg::Object::setUserData;
|
||||
using osg::UserDataContainer::addUserObject;
|
||||
|
||||
/** Get user data.*/
|
||||
virtual Referenced* getUserData();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user