Changeset 3668 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Mar 30, 2005, 11:40:16 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: made list more performant and less vulnerable to segfaults. changed the benchmark function to only display list attributes for now. changed pnode to iterator

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (2 diffs)
• util/list.h (modified) (4 diffs)

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

@@ -336 +336 @@
   if( pNode->parent != NULL )
     {
-      PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
       pNode->parent->children->remove(pNode);
     }
@@ -368 +368 @@
   NullParent* nullParent = NullParent::getInstance();
 
-  PNode* pn = this->children->enumerate();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  PNode* pn = iterator->nextElement();
+ 
   while( pn != NULL) 
     { 
       //this->children->remove(pn);
       nullParent->addChild(pn, pn->getMode());
-      pn = this->children->nextElement();
-    }
+      pn = iterator->nextElement();
+    }
+  delete iterator;
+  //this->parent->removeChild(this);
 }
 

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

@@ -75 +75 @@
   this->currentEl = startElement;
   this->firstEl = startElement;
-  this->counter = -1;
+  if( this->firstEl != NULL)
+    this->counter = -1;  
+  else 
+    this->counter = 0; 
 }
 
@@ -89 +92 @@
 inline T* tIterator<T>::nextElement ()
 {
+  /*
   this->counter++;
   if( this->counter == 0)
     return this->firstEl->curr;
-  
-  if( this->currentEl->next == NULL || this->currentEl == NULL)
+  */
+
+  if( this->currentEl == NULL)
     return NULL;
 
+  listElement<T>* tmp = this->currentEl;
   this->currentEl = this->currentEl->next;
-  return this->currentEl->curr;
+  return tmp->curr;
 }
 
@@ -104 +110 @@
 template<class T> class tList 
 {
-  
  public:
   tList ();
@@ -188 +193 @@
           else this->currentEl->next->prev = this->currentEl->prev;
 
-          te = this->currentEl->next;  // for what am i doing this?
+          //te = this->currentEl->next;  // for what am i doing this?
           delete this->currentEl;
-          this->currentEl = te;
+          //this->currentEl = te;
+          this->currentEl = NULL;
           this->size--;
           return;