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

Introduced a alternative implementation of observer_ptr<> that uses ObserverSet rather than an local WeakReference object.

Browse Source
This commit is contained in:
Robert Osfield
2010-05-20 13:38:28 +00:00
parent 858d52364e
commit 9cf330d7ff
5 changed files with 201 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/osg/Observer.cpp
View File

@@ -24,7 +24,8 @@ Observer::~Observer()
{
}
ObserverSet::ObserverSet()
ObserverSet::ObserverSet(const Referenced* observedObject):
_observedObject(const_cast<Referenced*>(observedObject))
{
//OSG_NOTICE<<"ObserverSet::ObserverSet() "<<this<<std::endl;
}
@@ -37,19 +38,40 @@ ObserverSet::~ObserverSet()
void ObserverSet::addObserver(Observer* observer)
{
//OSG_NOTICE<<"ObserverSet::addObserver("<<observer<<") "<<this<<std::endl;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getObserverSetMutex());
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
_observers.insert(observer);
}
void ObserverSet::removeObserver(Observer* observer)
{
//OSG_NOTICE<<"ObserverSet::removeObserver("<<observer<<") "<<this<<std::endl;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getObserverSetMutex());
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
_observers.erase(observer);
}
Referenced* ObserverSet::addRefLock()
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
if (!_observedObject) return 0;
int refCount = _observedObject->ref();
if (refCount == 1)
{
// The object is in the process of being deleted, but our
// objectDeleted() method hasn't been run yet (and we're
// blocking it -- and the final destruction -- with our lock).
_observedObject->unref_nodelete();
return 0;
}
return _observedObject;
}
void ObserverSet::signalObjectDeleted(void* ptr)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
for(Observers::iterator itr = _observers.begin();
itr != _observers.end();
++itr)
@@ -57,4 +79,7 @@ void ObserverSet::signalObjectDeleted(void* ptr)
(*itr)->objectDeleted(ptr);
}
_observers.clear();
// reset the observed object so that we know that it's now detached.
_observedObject = 0;
}

35
src/osg/Referenced.cpp
View File

@@ -242,9 +242,9 @@ Referenced::~Referenced()
// delete the ObserverSet
#if defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
if (_observerSet.get()) delete static_cast<ObserverSet*>(_observerSet.get());
if (_observerSet.get()) static_cast<ObserverSet*>(_observerSet.get())->unref();
#else
if (_observerSet) delete static_cast<ObserverSet*>(_observerSet);
if (_observerSet) static_cast<ObserverSet*>(_observerSet)->unref();
#endif
#if !defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
@@ -256,10 +256,16 @@ ObserverSet* Referenced::getOrCreateObserverSet() const
{
#if defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
ObserverSet* observerSet = static_cast<ObserverSet*>(_observerSet.get());
while (0 == observerSet) {
ObserverSet* newObserverSet = new ObserverSet;
while (0 == observerSet)
{
ObserverSet* newObserverSet = new ObserverSet(this);
newObserverSet->ref();
if (!_observerSet.assign(newObserverSet, 0))
delete newObserverSet;
{
newObserverSet->unref();
}
observerSet = static_cast<ObserverSet*>(_observerSet.get());
}
return observerSet;
@@ -267,17 +273,31 @@ ObserverSet* Referenced::getOrCreateObserverSet() const
if (_refMutex)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*_refMutex);
if (!_observerSet) _observerSet = new ObserverSet;
if (!_observerSet)
{
_observerSet = new ObserverSet(this);
_observerSet->ref();
}
return static_cast<ObserverSet*>(_observerSet);
}
else
{
if (!_observerSet) _observerSet = new ObserverSet;
if (!_observerSet) _observerSet = new ObserverSet(this);
return static_cast<ObserverSet*>(_observerSet);
}
#endif
}
void Referenced::addObserver(Observer* observer) const
{
getOrCreateObserverSet()->addObserver(observer);
}
void Referenced::removeObserver(Observer* observer) const
{
getOrCreateObserverSet()->removeObserver(observer);
}
void Referenced::signalObserversAndDelete(bool signalDelete, bool doDelete) const
{
#if defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
@@ -288,7 +308,6 @@ void Referenced::signalObserversAndDelete(bool signalDelete, bool doDelete) cons
if (observerSet && signalDelete)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*(observerSet->getObserverSetMutex()));
observerSet->signalObjectDeleted(const_cast<Referenced*>(this));
}