Changeset 3669 in orxonox.OLD

Timestamp:

Mar 30, 2005, 12:06:36 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now garbage collection is working correctlymake

Location:

orxonox/trunk/src

Files:

• garbage_collector.cc (modified) (2 diffs)
• lib/coord/null_parent.cc (modified) (2 diffs)
• lib/coord/p_node.cc (modified) (4 diffs)
• lib/util/list.h (modified) (3 diffs)

orxonox/trunk/src/garbage_collector.cc

@@ -116 +116 @@
     return;
   /* garbage collect */
-  PRINTF(3)("GarbageCollection is been done\n");
+  PRINTF(3)("=============================\n");
+  PRINTF(3)("Processing Garbage Collection\n");
+  PRINTF(3)("=============================\n");
+  int counter = 0;
   WorldInterface* wi = WorldInterface::getInstance();
   tList<WorldEntity>* list = wi->getEntityList();
@@ -126 +129 @@
       if( entity->isFinalized())
         {
-          PRINTF(1)("Finalizing object in list - not yet done realy\n");
+          PRINTF(4)("= finalizing object\n");
+          ++counter;
           
           /* first remove out of entity list */
           list->remove(entity);
           /* second remove out of pnode tree */
-          //entity->remove();
-          //delete entity;
+          entity->remove();
+          delete entity;
         }
       entity = iterator->nextElement();
     }
+  PRINTF(3)("= collected %i unused objects\n", counter);
+  PRINTF(3)("=============================\n");
   
+  
+
+
   /* reset time to count again up to this->delay */
   this->time = 0;

orxonox/trunk/src/lib/coord/null_parent.cc

@@ -83 +83 @@
   *this->absCoordinate = *this->relCoordinate;
   *this->absDirection = parent->getAbsDir () * *this->relDirection;
-  
-  PNode* pn = this->children->enumerate ();
+
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate ();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
@@ -93 +95 @@
         pn->parentDirChanged ();
       pn->update (dt);
-      pn = this->children->nextElement ();
+      //pn = this->children->nextElement ();
+      pn = iterator->nextElement();
     }
 

orxonox/trunk/src/lib/coord/p_node.cc

@@ -354 +354 @@
 {
   pNode->remove();
-  //this->children->remove (pNode);
+  this->children->remove (pNode);
   pNode->parent = NULL;
 }
@@ -378 +378 @@
     }
   delete iterator;
-  //this->parent->removeChild(this);
+  this->parent->children->remove(this);
 }
 
@@ -499 +499 @@
   
   
-  PNode* pn = this->children->enumerate();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
@@ -509 +511 @@
 
       pn->update(dt);
-      pn = this->children->nextElement();
-    }
+      //pn = this->children->nextElement();
+      pn = iterator->nextElement();
+    }
+  delete iterator;
 
   this->timeStamp = timeStamp;

orxonox/trunk/src/lib/util/list.h

@@ -65 +65 @@
  private:
   listElement<T>* currentEl;
-  listElement<T>* firstEl;
-  int counter;
+  listElement<T>* tmpEl;
 };
 
@@ -74 +73 @@
 {
   this->currentEl = startElement;
-  this->firstEl = startElement;
-  if( this->firstEl != NULL)
-    this->counter = -1;  
-  else 
-    this->counter = 0; 
+  this->tmpEl = NULL;
 }
 
@@ -92 +87 @@
 inline T* tIterator<T>::nextElement ()
 {
-  /*
-  this->counter++;
-  if( this->counter == 0)
-    return this->firstEl->curr;
-  */
-
   if( this->currentEl == NULL)
     return NULL;
 
-  listElement<T>* tmp = this->currentEl;
+  this->tmpEl = this->currentEl;
   this->currentEl = this->currentEl->next;
-  return tmp->curr;
+  return this->tmpEl->curr;
 }