Changeset 9549 for OpenSceneGraph/trunk/include/osg/Referenced

Timestamp:

01/26/09 16:16:24 (4 years ago)

Author:

robert

Message:

Fixed effective leak in Program::PerContextProgram? caused by previously osg::State keeping a set of std::ref_ptr<Program::PerContextProgram?> without ever pruning this list.
The fix was to convert the osg::State to use C pointers for the set of applied PerContexProgram? objects, and use the osg::Oberver mechanism to avoid dangling pointers for being maintained in osg::State.

Files:

• OpenSceneGraph/trunk/include/osg/Referenced (modified) (3 diffs)

OpenSceneGraph/trunk/include/osg/Referenced

@@ -90 +90 @@
 
         /** Add a Observer that is observing this object, notify the Observer when this object gets deleted.*/
-        void addObserver(Observer* observer);
+        void addObserver(Observer* observer) const;
 
         /** Add a Observer that is observing this object, notify the Observer when this object gets deleted.*/
-        void removeObserver(Observer* observer);
+        void removeObserver(Observer* observer) const;
 
     public:
@@ -122 +122 @@
         struct ObserverSetData;
 
-        OpenThreads::AtomicPtr _observerSetDataPtr;
+        mutable OpenThreads::AtomicPtr _observerSetDataPtr;
 
         mutable OpenThreads::Atomic     _refCount;
@@ -131 +131 @@
         mutable int                     _refCount;
         
-        void*                           _observers;
+        mutable void*                   _observers;
 #endif
 };