Changeset 3668 in orxonox.OLD

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

Files:

• defs/debug.h (modified) (1 diff)
• garbage_collector.cc (modified) (1 diff)
• lib/coord/p_node.cc (modified) (2 diffs)
• lib/util/list.h (modified) (4 diffs)
• orxonox.cc (modified) (3 diffs)

orxonox/trunk/src/defs/debug.h

@@ -58 +58 @@
 // DEFINE MODULES \\
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_WORLD              3
 #define DEBUG_MODULE_PNODE              0
 #define DEBUG_MODULE_WORLD_ENTITY       0

orxonox/trunk/src/garbage_collector.cc

@@ -131 +131 @@
           list->remove(entity);
           /* second remove out of pnode tree */
-          entity->remove();
+          //entity->remove();
+          //delete entity;
         }
       entity = iterator->nextElement();

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;

orxonox/trunk/src/orxonox.cc

@@ -367 +367 @@
   dt = end - ini;
 
-  int type = -1; 
+  int type = 3; 
   /* type   -1 == all 
      type    0 == framework
      type    1 == vector
      type    2 == quaternion
+     type    3 == lists
   */
   if(type == 0 || type == -1)
     {
       /* framework test*/
-
+      
       printf("Generating Objects:\t\t\t\t\t%i\n", ITERATIONS);
       /* ************WorldEntity class test************** */
@@ -510 +511 @@
           rdtscl(end);
           mittel += (end - ini - dt);
-          }
+        }
       mi = mittel / (float)ITERATIONS;
       printf(" Call function tick() of Prim:\t\t%11.2f\n", mi);
-
-
-      }
+      
+      
+    }
+  
   if(type == 1 || type == -1)
     {
@@ -556 +558 @@
       printf(" CrossMult of two vectors:\t\t%11.2f\n", mi);
 
-      if(type == 1 || type == -1)
-        {
-          /* quaternion test */
-          printf("\nDoing some simple quaternion operations: \t\t%i\n", VECTOR_MAX);
-          /* vector test */
-          Quaternion* a = new Quaternion();
-          Quaternion* b = new Quaternion();
-          Quaternion* c = new Quaternion();
-          
-          unsigned long mittel, ini, end;
-          float mi;
-          int i = 0;
-          // quaternion generieren mit spez konstruktor
-          mittel = 0;
-          Vector* qa = new Vector(4.6, 9.3, 0.4);
-          Vector* qb = new Vector(3.5, 6.1, 4.3);
-          for(i = 0; i < VECTOR_MAX; ++i)
-            {
-              rdtscl(ini);
-              
-              Quaternion* qu = new Quaternion(*qa, *qb);
-              
-              rdtscl(end);
-              delete qu;
-              mittel += (end - ini - dt);
-            }
-          delete a;
-          delete b;
-          mi = mittel / (float)VECTOR_MAX;
-          printf(" Gen. quatern. betw. two vectors:\t%11.2f\n", mi);
-
-
-          // multiplication
-          mittel = 0;
-          for(i = 0; i < VECTOR_MAX; ++i)
-            {
-              rdtscl(ini);
-              
-              *c = *a * *b;
-              
-              rdtscl(end);
-              mittel += (end - ini - dt);
-            }
-          mi = mittel / (float)VECTOR_MAX;
-          printf(" Multiplying two quat.(=rot): a * b\t%11.2f\n", mi);
-          
-
-
-          // rotating a vector by a quaternion
-          mittel = 0;
-          for(i = 0; i < VECTOR_MAX; ++i)
-            {
-              rdtscl(ini);
-              
-              *qa = a->apply(*qb);
-              
-              rdtscl(end);
-              mittel += (end - ini - dt);
-            }
-          mi = mittel / (float)VECTOR_MAX;
-          printf(" Rot a vec by a quat: q->apply(v)\t%11.2f\n", mi);
-          
-          
-
-          // generate rotation matrix
-          mittel = 0;
-          float matrix[4][4];
-          for(i = 0; i < VECTOR_MAX; ++i)
-            {
-              rdtscl(ini);
-              
-              a->matrix(matrix);
-              
-              rdtscl(end);
-              mittel += (end - ini - dt);
-            }
-          mi = mittel / (float)VECTOR_MAX;
-          printf(" Generate rot matrix: q->matrix(m)\t%11.2f\n", mi);
-        }
-      if( type == 3 || type == -1)
-        {
-          /* list tests*/
-          printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
-          tList<char>* list = new tList<char>();
-          char* name;
-
-          printf(" Adding[1..10] elements to list, found:\n");
-          list->add("1");
-          list->add("2");
-          list->add("3");
-          list->add("4");
-          list->add("5");
-          list->add("6");
-          list->add("7");
-          list->add("8");
-          list->add("9");
-          list->add("10");
-
-          /*give list out */
-          tIterator<char>* iterator = list->getIterator();
+    }
+  if( type == 2 || type == -1)
+    {
+      /* quaternion test */
+      printf("\nDoing some simple quaternion operations: \t\t%i\n", VECTOR_MAX);
+      /* vector test */
+      Quaternion* a = new Quaternion();
+      Quaternion* b = new Quaternion();
+      Quaternion* c = new Quaternion();
+      
+      unsigned long mittel, ini, end;
+      float mi;
+      int i = 0;
+      // quaternion generieren mit spez konstruktor
+      mittel = 0;
+      Vector* qa = new Vector(4.6, 9.3, 0.4);
+      Vector* qb = new Vector(3.5, 6.1, 4.3);
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          
+          Quaternion* qu = new Quaternion(*qa, *qb);
+          
+          rdtscl(end);
+          delete qu;
+          mittel += (end - ini - dt);
+        }
+      delete a;
+      delete b;
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Gen. quatern. betw. two vectors:\t%11.2f\n", mi);
+      
+      
+      // multiplication
+      mittel = 0;
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          
+          *c = *a * *b;
+          
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Multiplying two quat.(=rot): a * b\t%11.2f\n", mi);
+      
+      
+      
+      // rotating a vector by a quaternion
+      mittel = 0;
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          
+          *qa = a->apply(*qb);
+          
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Rot a vec by a quat: q->apply(v)\t%11.2f\n", mi);
+      
+      
+      
+      // generate rotation matrix
+      mittel = 0;
+      float matrix[4][4];
+      for(i = 0; i < VECTOR_MAX; ++i)
+        {
+          rdtscl(ini);
+          
+          a->matrix(matrix);
+          
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)VECTOR_MAX;
+      printf(" Generate rot matrix: q->matrix(m)\t%11.2f\n", mi);
+    }
+  if( type == 3 || type == -1)
+    {
+      /* list tests*/
+      printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
+      tList<char>* list = new tList<char>();
+      char* name;
+      
+      printf(" Adding[1..10] elements to list, found:\n");
+      list->add("1");
+      list->add("2");
+      list->add("3");
+      list->add("4");
+      list->add("5");
+      list->add("6");
+      list->add("7");
+      list->add("8");
+      list->add("9");
+      list->add("10");
+      
+      /*give list out */
+      tIterator<char>* iterator = list->getIterator();
+      name = iterator->nextElement();
+      printf("  List Elements: \t\t");
+      while( name != NULL)
+        {
+          printf("%s,", name);
           name = iterator->nextElement();
-          printf("  List Elements: \t\t");
-          while( name != NULL)
-            {
-              printf("%s,", name);
-              name = iterator->nextElement();
-            }
-          delete iterator;
-          printf("\n");
-
-
-          /*removing some elements from the list*/
-          printf(" Removing elements [2,3,6,8,10], adding [11] now found:\n");
-          list->remove("2");
-          list->remove("3");
-          list->remove("6");
-          list->remove("8");
-          list->remove("10");
-          list->add("11");
-          /*give list out */
-          iterator = list->getIterator();
+        }
+      delete iterator;
+      printf("\n");
+      
+      
+      /*removing some elements from the list*/
+      printf(" Removing elements [2,3,6,8,10], adding [11] now found:\n");
+      list->remove("2");
+      list->remove("3");
+      list->remove("6");
+      list->remove("8");
+      list->remove("10");
+      list->add("11");
+      /*give list out */
+      iterator = list->getIterator();
+      name = iterator->nextElement();
+      printf("  List Elements: \t\t");
+      while( name != NULL)
+        {
+          printf("%s,", name);
           name = iterator->nextElement();
-          printf("  List Elements: \t\t");
-          while( name != NULL)
-            {
-              printf("%s,", name);
-              name = iterator->nextElement();
-            }
-          delete iterator;
-          printf("\n");
-          
-          delete list;
-          printf("\nChecking list performance:\t\t\t\t%i\n", LIST_MAX);
-
-          tList<int>* plist = new tList<int>();
-          unsigned long mittel, ini, end;
-          float mi;
-          int i = 0;
-          mittel = 0;
-          for(i = 0; i < LIST_MAX; ++i)
-            {
-              rdtscl(ini);
-              
-              plist->add(&i);
-              
-              rdtscl(end);
-              mittel += (end - ini - dt);
-            }
-          mi = mittel / (float)LIST_MAX;
-          printf(" Adding reference to list:\t\t%11.2f\n", mi);
-
-          mittel = 0;
-          for(i = 0; i < LIST_MAX; ++i)
-            {
-              rdtscl(ini);
-              
-              plist->remove(&i);
-              
-              rdtscl(end);
-              mittel += (end - ini - dt);
-            }
-          mi = mittel / (float)LIST_MAX;
-          printf(" Removing 1st reference from list:\t%11.2f\n", mi);
-          
-          
-
-        }
+        }
+      delete iterator;
+      printf("\n");
+      
+      delete list;
+      printf("\nChecking list performance:\t\t\t\t%i\n", LIST_MAX);
+      
+      tList<int>* plist = new tList<int>();
+      unsigned long mittel, ini, end;
+      float mi;
+      int i = 0;
+      mittel = 0;
+      for(i = 0; i < LIST_MAX; ++i)
+        {
+          rdtscl(ini);
+          
+          plist->add(&i);
+          
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)LIST_MAX;
+      printf(" Adding reference to list:\t\t%11.2f\n", mi);
+      
+      mittel = 0;
+      for(i = 0; i < LIST_MAX; ++i)
+        {
+          rdtscl(ini);
+          
+          plist->remove(&i);
+          
+          rdtscl(end);
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)LIST_MAX;
+      printf(" Removing 1st reference from list:\t%11.2f\n", mi);
+      
+      
+      
     }
-}
+  
+}