Changeset 7192

Timestamp:

Aug 20, 2010, 2:59:20 AM (14 years ago)

Author:

landauf

Message:

Added a small SharedPtr template for use in Functor and Executor. It's an intrusive approach that requires the object to implement a reference counter. The SharedPtr is extensible to reflect the hierarchy of Functor, FunctorStatic, FunctorMember<T>, and all subclasses (same for Executor).

Location:

code/branches/consolecommands3/src/libraries/core

Files:

• Executor.cc (modified) (2 diffs)
• Executor.h (modified) (3 diffs)
• Functor.h (modified) (5 diffs)
• SharedPtr.h (added)

code/branches/consolecommands3/src/libraries/core/Executor.cc

@@ -39 +39 @@
 namespace orxonox
 {
+    int Functor::instances_s = 0;
+    int Executor::instances_s = 0;
+
     Executor::Executor(Functor* functor, const std::string& name)
     {
+        this->references_ = 0;
         this->functor_ = functor;
         this->name_ = name;
+        ++instances_s; COUT(0) << "executor ++: " << instances_s << std::endl;
     }
 
@@ -48 +53 @@
     {
         delete this->functor_;
+        --instances_s; COUT(0) << "executor --: " << instances_s << std::endl;
     }
 

code/branches/consolecommands3/src/libraries/core/Executor.h

@@ -41 +41 @@
     class _CoreExport Executor
     {
+        friend class SharedPtr<Executor>;
+
         public:
             Executor(Functor* functor, const std::string& name = "");
@@ -108 +110 @@
             std::string name_;
             MultiType defaultValue_[MAX_FUNCTOR_ARGUMENTS];
+
+        private:
+            inline void incrementReferenceCount()
+                { ++this->references_; }
+            inline void decrementReferenceCount()
+                { --this->references_; if (this->references_ == 0) delete this; }
+
+            int references_;
+            static int instances_s;
     };
 
@@ -187 +198 @@
     };
 
+
+
+    typedef SharedPtr<Executor> ExecutorPtr;
+
+    typedef SharedChildPtr<ExecutorStatic, Executor> ExecutorStaticPtr;
+
+    template <class T>
+    class ExecutorMemberPtr : public SharedChildPtr<ExecutorMember<T>, Executor>
+    {
+        public:
+            inline ExecutorMemberPtr() : SharedChildPtr<ExecutorMember<T>, Executor>() {}
+            inline ExecutorMemberPtr(ExecutorMember<T>* pointer) : SharedChildPtr<ExecutorMember<T>, Executor>(pointer) {}
+//            inline ExecutorMemberPtr(const ExecutorMemberPtr& other) : SharedChildPtr<ExecutorMember<T>, Executor>(other) {}
+    };
+
+
+
     inline Executor* createExecutor(Functor* functor, const std::string& name = "")
     {

code/branches/consolecommands3/src/libraries/core/Functor.h

@@ -38 +38 @@
 #include "util/Debug.h"
 #include "util/MultiType.h"
+#include "SharedPtr.h"
 
 namespace orxonox
@@ -88 +89 @@
     class _CoreExport Functor
     {
+        friend class SharedPtr<Functor>;
+
         public:
             struct Type
@@ -101 +104 @@
 
         public:
-            Functor() {}
-            virtual ~Functor() {}
+            Functor() : references_(0) { ++instances_s; COUT(0) << "functor ++: " << instances_s << std::endl; }
+            virtual ~Functor() { --instances_s; COUT(0) << "functor --: " << instances_s << std::endl; }
 
             virtual MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null) = 0;
@@ -119 +122 @@
 
             virtual const std::type_info& getHeaderIdentifier() const = 0;
+
+        private:
+            inline void incrementReferenceCount()
+                { ++this->references_; }
+            inline void decrementReferenceCount()
+                { --this->references_; if (this->references_ == 0) delete this; }
+
+            int references_;
+            static int instances_s;
     };
 
@@ -200 +212 @@
             T* object_;
             const T* constObject_;
+    };
+
+
+
+    typedef SharedPtr<Functor> FunctorPtr;
+
+    typedef SharedChildPtr<FunctorStatic, Functor> FunctorStaticPtr;
+
+    template <class T>
+    class FunctorMemberPtr : public SharedChildPtr<FunctorMember<T>, Functor>
+    {
+        public:
+            inline FunctorMemberPtr() : SharedChildPtr<FunctorMember<T>, Functor>() {}
+            inline FunctorMemberPtr(FunctorMember<T>* pointer) : SharedChildPtr<FunctorMember<T>, Functor>(pointer) {}
+//            inline FunctorMemberPtr(const FunctorMemberPtr& other) : SharedChildPtr<FunctorMember<T>, Functor>(other) {}
     };