Changeset 5791 for code/branches/core5/src/libraries

Timestamp:

Sep 26, 2009, 2:05:30 AM (15 years ago)

Author:

landauf

Message:

Added destroy() function to OrxonoxClass.
Removed destroy() functions from some subclasses.
Expanded Timer to accept Functors of other classes too.

Location:

code/branches/core5/src/libraries

Files:

• core/OrxonoxClass.cc (modified) (2 diffs)
• core/OrxonoxClass.h (modified) (3 diffs)
• tools/Timer.h (modified) (2 diffs)

code/branches/core5/src/libraries/core/OrxonoxClass.cc

@@ -45 +45 @@
         this->parents_ = 0;
         this->metaList_ = new MetaObjectList();
+        this->referenceCount_ = 0;
+        this->requestedDestruction_ = false;
     }
 
@@ -55 +57 @@
         if (this->parents_)
             delete this->parents_;
+    }
+
+    /** @brief Deletes the object if no smart pointers point to this object. Otherwise schedules the object to be deleted as soon as possible. */
+    void OrxonoxClass::destroy()
+    {
+        if (this->referenceCount_ > 0)
+            this->requestedDestruction_ = true;
+        else
+            delete this;
     }
 

code/branches/core5/src/libraries/core/OrxonoxClass.h

@@ -59 +59 @@
             virtual ~OrxonoxClass();
 
+            void destroy();
+
             /** @brief Function to collect the SetConfigValue-macro calls. */
             void setConfigValues() {};
@@ -92 +94 @@
             bool isDirectParentOf(const OrxonoxClass* object);
 
+            inline unsigned int getReferenceCount() const
+                { return this->referenceCount_; }
+
             /**
             @brief
@@ -117 +122 @@
 
         private:
+            /** @brief Increments the reference counter (for smart pointers). */
+            inline void incrementReferenceCount()
+                { ++this->referenceCount_; }
+            /** @brief Decrements the reference counter (for smart pointers). */
+            inline void decrementReferenceCount()
+                { --this->referenceCount_; if (this->referenceCount_ == 0 && this->requestedDestruction_) { delete this; } }
+
             Identifier* identifier_;                   //!< The Identifier of the object
             std::set<const Identifier*>* parents_;     //!< List of all parents of the object
             MetaObjectList* metaList_;                 //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in
+            unsigned int referenceCount_;              //!< Counts the references from smart pointers to this object
+            bool requestedDestruction_;                //!< Becomes true after someone called delete on this object
+
             //! 'Fast map' that holds this-pointers of all derived types
             std::vector<std::pair<unsigned int, void*> > objectPointers_;

code/branches/core5/src/libraries/tools/Timer.h

@@ -143 +143 @@
                 @param exeuctor A executor of the function to call
             */
-            Timer(float interval, bool bLoop, T* object, ExecutorMember<T>* exeuctor, bool bKillAfterCall = false)
+            template <class O>
+            Timer(float interval, bool bLoop, T* object, ExecutorMember<O>* exeuctor, bool bKillAfterCall = false)
             {
                 this->setTimer(interval, bLoop, object, exeuctor, bKillAfterCall);
@@ -155 +156 @@
                 @param exeuctor A executor of the function to call
             */
-            void setTimer(float interval, bool bLoop, T* object, ExecutorMember<T>* executor, bool bKillAfterCall = false)
+            template <class O>
+            void setTimer(float interval, bool bLoop, T* object, ExecutorMember<O>* executor, bool bKillAfterCall = false)
             {
                 this->deleteExecutor();