Changeset 4936 in orxonox.OLD for orxonox/trunk/src/util/object_manager.h

Timestamp:

Jul 22, 2005, 7:30:49 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: FastFactory: gets flushed now → devMail is withdrawn now.
Also reimplemented much stuff, so it now works most out of the BaseClass. → still some minor stuff to fix.
GarbageCollector, i will come to you soon …

File:

• orxonox/trunk/src/util/object_manager.h (modified) (5 diffs)

orxonox/trunk/src/util/object_manager.h

@@ -56 +56 @@
     void kill(ClassID classID, BaseObject* object);
 
+    virtual void fabricate() = NULL;
     // retrival functions for fast Ineraction
     //FastFactory* getFastFactory(ClassID classID);
+
+    static void flushAll(bool hardFLUSH = false);
+    void flush(bool hardFLUSH = false);
 
     /** @returns the first FastFactory */
@@ -102 +106 @@
 
     T* resurect();
-    void kill(T* object);
-
   private:
     tFastFactory(ClassID classID, const char* fastFactoryName);
 
-    T* fabricate();
+    virtual void fabricate();
 
   private:
@@ -142 +144 @@
 
 template<class T>
-    T* tFastFactory<T>::fabricate()
+    void tFastFactory<T>::fabricate()
 {
   FastObjectMember* tmpFirstDead = new FastObjectMember;
-  T* fabricatedT = new T();
-  tmpFirstDead->objectPointer = fabricatedT;
+  tmpFirstDead->objectPointer = new T();
   tmpFirstDead->next = this->deadList;
   ++this->storedDeadObjects;
 
   this->deadList = tmpFirstDead;
-  return fabricatedT;
 }
 
@@ -175 +175 @@
     PRINTF(2)("The deadList of Class %s is empty, this may be either because it has not been filled yet, or the cache is to small.\n" \
         "Fabricating a new %s", this->getName(), this->getName());
-    return this->fabricate();
+    this->fabricate();
+    return resurect();
   }
   else
@@ -187 +188 @@
     return dynamic_cast<T*>(tmpC->objectPointer);
   }
-}
-
-template<class T>
-    void tFastFactory<T>::kill(T* object)
-{
-  FastObjectMember* tmpC;
-  if (unlikely(this->unusedContainers == NULL))
-  {
-    tmpC = new FastObjectMember;
-  }
-  else
-  {
-    tmpC = this->unusedContainers;
-    this->unusedContainers = this->unusedContainers->next;
-  }
-
-  tmpC->next = this->deadList;
-  tmpC->objectPointer = object;
 }