Changeset 3649 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 24, 2005, 5:13:20 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: tuning orxonox via benchmarking, virt. inline functions can't be inline unless used in a very spec way

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (7 diffs)
• world_entities/primitive.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (2 diffs)

orxonox/trunk/src/orxonox.cc

@@ -269 +269 @@
 
 
-#include "list.h"
-#include "world_entity.h"
-#include "vector.h"
-#include <asm/msr.h>
-#include <linux/timex.h>
-
-
-#define LIST_MAX 10000
-#define VECTOR_MAX 1000000
-#define ITERATIONS 10000
 
 /**
@@ -321 +311 @@
 }
 
+
 int startOrxonox(int argc, char** argv)
 {
@@ -337 +328 @@
   
 }
+
+
+#include "list.h"
+#include "world_entity.h"
+#include "vector.h"
+#include "player.h"
+#include "primitive.h"
+#include <asm/msr.h>
+#include <linux/timex.h>
+
+
+#define LIST_MAX 10000
+#define VECTOR_MAX 1000000
+#define ITERATIONS 10000
 
 
@@ -351 +356 @@
   dt = end - ini;
 
-  int type = 0; 
+  int type = -1; 
   /* type   -1 == all 
      type    0 == framework
@@ -360 +365 @@
     {
       /* framework test*/
+
+      printf("Generating Objects:\n");
+      /* ************WorldEntity class test************** */
       WorldEntity* w = NULL;
       int i = 0;
@@ -371 +379 @@
           
           rdtscl(end);
+          delete w;
           mittel += (end - ini - dt);
         }
       float mi = mittel / (float)ITERATIONS;
-      printf("Generate a WorldEntity objec [cycles]t: \t%f\n", mi);
-      
-      
+      printf(" Generate a WorldEntity objec [cycles]: \t%f\n", mi);
+      
+      mittel = 0;
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          
+          WorldEntity* w = new Primitive(P_SPHERE);
+          
+          rdtscl(end);
+          delete w;
+          mittel += (end - ini - dt);
+        }
+      mi = mittel / (float)ITERATIONS;
+      printf(" Generate a Primitive  objec [cycles]:\t\t%f\n", mi);
+
+      printf("\nCalling function inline &| virtual\n");
       mittel = 0;
       w = new WorldEntity();
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          
+          w->tick(0.0f);
+
+          rdtscl(end);
+          mittel += (end - ini - dt);
+          }
+      //delete w;
+      mi = mittel / (float)ITERATIONS;
+      printf(" virt funct tick() of WE [cycles]: \t\t%f\n", mi);
+
+
+      mittel = 0;
+      WorldEntity wo;
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          
+          wo.tick(0.0f);
+           
+          rdtscl(end);
+          mittel += (end - ini - dt);
+          }
+      //delete w;
+      mi = mittel / (float)ITERATIONS;
+      printf(" inl virt funct tick() of WE v2 [cycles]: \t%f\n", mi);
+
+      
+      tList<WorldEntity>* list = new tList<WorldEntity>();
+
+      
+      /* ************Primitvie class test************** */
+      list = new tList<WorldEntity>();
+ 
+      
+      
+      mittel = 0;
+      w = new Primitive(P_SPHERE);
       for(i = 0; i < ITERATIONS; ++i)
         {
@@ -389 +452 @@
           }
       mi = mittel / (float)ITERATIONS;
-      printf("Call an empty function of WE [cycles]t: \t%f\n", mi);
-      
-      tList<WorldEntity>* list = new tList<WorldEntity>();
-      
-      
-      // generating list
-      for(i = 0; i < LIST_MAX; ++i)
-        {
-          w = new WorldEntity();
-          list->add(w);
-        }
-        
-      
-        // reuse list
-      w = list->enumerate();
-      while( w != NULL)
-        {
-          w->tick(0.0f);
-          w = list->nextElement();
-        }
+      printf("Call function tick() of Prim [cycles]:\t\t%f\n", mi);
+
 
       }

orxonox/trunk/src/world_entities/primitive.cc

@@ -149 +149 @@
    \param time in sec
 */
-void Primitive::tick (float time) 
+inline void Primitive::tick (float time) 
 {
   // Vector v(0.0, 0.0, 1.0);
@@ -159 +159 @@
    \brief drawing function of the object
 */
-void Primitive::draw () 
+inline void Primitive::draw () 
 {
   glMatrixMode(GL_MODELVIEW);

orxonox/trunk/src/world_entities/world_entity.cc

@@ -170 +170 @@
    Handle all stuff that should update with time inside this method (movement, animation, etc.)
 */
-void WorldEntity::tick(float time) 
+inline void WorldEntity::tick(float time) 
 {
 }
@@ -180 +180 @@
    This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
 */
-void WorldEntity::draw() 
+inline void WorldEntity::draw() 
 {}