Changeset 4942 in orxonox.OLD for orxonox/trunk

Timestamp:

Jul 23, 2005, 1:21:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: garbage-collection works perfectly.
also taken out the finalized-tag from BaseObject
@patrick: i hope, you agree, that it is not used anymore, and i hope you don't mind me having ereased it.

Location:

orxonox/trunk/src

Files:

• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• subprojects/benchmark.cc (modified) (1 diff)
• util/garbage_collector.cc (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)

orxonox/trunk/src/lib/lang/base_object.cc

@@ -34 +34 @@
   this->className = NULL;
   this->classID = CL_BASE_OBJECT;
-  this->finalized = false;
 
   this->objectName = NULL;

orxonox/trunk/src/lib/lang/base_object.h

@@ -38 +38 @@
   void whatIs() const;
 
-  /** @returns if the object is finalized */
-  inline bool isFinalized() { return this->finalized; };
-
-
  protected:
   void setClassID(long classID, const char* className);
-
-  /** \brief this finalizes an object and makes it ready to be garbage collected */
-  void finalize() { this->finalized = true; };
 
   private:
@@ -52 +45 @@
     long               classID;          //!< this is the id from the class_id.h enumeration
     char*              objectName;       //!< The name of this object
-
-    bool               finalized;        //!< is true if the object is ready to be garbage collected
 };
 

orxonox/trunk/src/orxonox.cc

@@ -95 +95 @@
   delete EventHandler::getInstance();
 
-  ClassList::debug(3, CL_PARENT_NODE);
+  ClassList::debug();
 
   PRINT(3)

orxonox/trunk/src/subprojects/benchmark.cc

@@ -176 +176 @@
           rdtscl(ini);
 
-          bo->isFinalized();
+//          bo->isFinalized();
 
           rdtscl(end);

orxonox/trunk/src/util/garbage_collector.cc

@@ -89 +89 @@
 void GarbageCollector::collect(BaseObject* object)
 {
-  printf("TEST\n");
   State::getWorldEntityList()->remove(dynamic_cast<WorldEntity*>(object));
   FastObjectMember* tmpC;

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

@@ -70 +70 @@
 //      this->finalize();
       GarbageCollector::getInstance()->collect(this);
+      this->lifeCycle = 0.0;
 
     }