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

From Tim Moore, improved doxygen comments

Browse Source
This commit is contained in:
Robert Osfield
2010-05-17 14:43:41 +00:00
parent ccd9f31309
commit 65c09c8e0d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/Referenced
View File

@@ -89,8 +89,7 @@ class OSG_EXPORT Referenced
not delete it, even if ref count goes to 0. Warning, unref_nodelete()
should only be called if the user knows exactly who will
be responsible for, one should prefer unref() over unref_nodelete()
as the later can lead to memory leaks.
*/
as the later can lead to memory leaks.*/
int unref_nodelete() const;
/** Return the number pointers currently referencing this object. */

17
include/osg/observer_ptr
View File

@@ -72,23 +72,31 @@ struct UnsafeWeakReference : public WeakReference<T>
}
};
/**
* Delete the WeakReference object if necessary while negociating
* with the observer in the referenced object.
*/
Delete the WeakReference object, if necessary. The WeakReference
should be deleted when the last observer_ptr pointing to it goes
out of scope; this avoids a memory leak. A race must be prevented
between this function and WeakReference::objectDeleted(). If the
referenced object is being deleted at the same time as this
function is called, we can't prevent objectDeleted() from being
run, so we need to leave the WeakReference in a valid state and let
objectDeleted() delete it. */
template<typename T>
void maybeDelete(WeakReference<T>* weakRef)
{
if (!weakRef || weakRef->unref_nodelete() > 0)
return;
// No other observer_ptrs hold weakRef, so clean up.
bool doDelete = false;
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(weakRef->_mutex);
if (!weakRef->_ptr)
{
// The object has already been deleted; it's OK to delete weakRef.
doDelete = true;
}
else
{
// Carefully remove weakRef as an observer.
UnsafeWeakReference<T>* unsafe
= dynamic_cast<UnsafeWeakReference<T>*>(weakRef);
if (!unsafe && weakRef->_ptr->ref() == 1)
@@ -100,6 +108,9 @@ void maybeDelete(WeakReference<T>* weakRef)
}
else
{
// The referenced object won't be deleted until we
// decrement the reference count, so go ahead and
// remove the observer.
doDelete = true;
weakRef->_ptr->removeObserver(weakRef);
if (!unsafe)