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

Added a Refrenced::getGlobalReferencedMutex, and OpenThreads::ScopedPointerLock() and use of this in add/removeParent() codes

Browse Source 
to avoid threading problems when using atomic ref counting.
This commit is contained in:
Robert Osfield
2008-10-14 14:27:41 +00:00
parent af13e84093
commit ac975bf79a
7 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osg/Drawable.cpp
View File

@@ -281,32 +281,17 @@ void Drawable::computeDataVariance()
void Drawable::addParent(osg::Node* node)
{
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
_parents.push_back(node);
}
else
{
_parents.push_back(node);
}
_parents.push_back(node);
}
void Drawable::removeParent(osg::Node* node)
{
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
else
{
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}

25
src/osg/Node.cpp
View File

@@ -95,32 +95,17 @@ Node::~Node()
void Node::addParent(osg::Group* node)
{
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
_parents.push_back(node);
}
else
{
_parents.push_back(node);
}
_parents.push_back(node);
}
void Node::removeParent(osg::Group* node)
{
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
else
{
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
void Node::accept(NodeVisitor& nv)

6
src/osg/Referenced.cpp
View File

@@ -79,6 +79,12 @@ struct DeleteHandlerPointer
DeleteHandler* _ptr;
};
OpenThreads::Mutex* Referenced::getGlobalReferencedMutex()
{
return 0;
// static OpenThreads::Mutex s_ReferencedGlobalMutext;
// return &s_ReferencedGlobalMutext;
}
typedef std::set<Observer*> ObserverSet;

5
src/osg/StateAttribute.cpp
View File

@@ -27,11 +27,16 @@ StateAttribute::StateAttribute()
void StateAttribute::addParent(osg::StateSet* object)
{
osg::notify(osg::INFO)<<"Adding parent"<<getRefMutex()<<std::endl;
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
_parents.push_back(object);
}
void StateAttribute::removeParent(osg::StateSet* object)
{
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object);
if (pitr!=_parents.end()) _parents.erase(pitr);
}

25
src/osg/StateSet.cpp
View File

@@ -252,32 +252,17 @@ void StateSet::computeDataVariance()
void StateSet::addParent(osg::Object* object)
{
// osg::notify(osg::INFO)<<"Adding parent"<<std::endl;
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
_parents.push_back(object);
}
else
{
_parents.push_back(object);
}
_parents.push_back(object);
}
void StateSet::removeParent(osg::Object* object)
{
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
else
{
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
int StateSet::compare(const StateSet& rhs,bool compareAttributeContents) const