Changeset 3800 in orxonox.OLD for orxonox/trunk/src/lib/coord

Timestamp:

Apr 13, 2005, 6:23:17 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: defined macro for likely function, PNode now uses this branche prediction mechanism

File:

• orxonox/trunk/src/lib/coord/p_node.cc (modified) (10 diffs)

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

@@ -29 +29 @@
 #include "null_parent.h"
 
-#ifdef __unix__
- #include <glib-2.0/glib/gmacros.h>
-#endif
-
 //#include "vector.h"
 //#include "quaternion.h"
@@ -64 +60 @@
 
   *this->absCoordinate = *absCoordinate;
-#ifdef __unix__
-  if ( G_UNLIKELY(parent != NULL))
-#else 
-  if ( parent != NULL)
-#endif
-    {
-      *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
-      parent->addChild (this);
-    }
+
+  __LIKELY_IF(parent != NULL)
+  {
+    *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
+    parent->addChild (this);
+  }
   else 
     this->relCoordinate = new Vector(0,0,0);
@@ -252 +245 @@
 void PNode::shiftCoor (Vector* shift)
 {
-#ifdef __unix__
-  if( G_UNLIKELY(this->bAbsCoorChanged))
-#else
-  if( this->bAbsCoorChanged)
-#endif
+
+  __UNLIKELY_IF( this->bAbsCoorChanged)
     {
       *this->absCoordinate = *this->absCoordinate + *shift;
@@ -291 +281 @@
 void PNode::shiftCoor (Vector shift)
 {
-#ifdef __unix__
-  if( G_UNLIKELY(this->bAbsCoorChanged))
-#else
-  if( this->bAbsCoorChanged)
-#endif
+
+  __UNLIKELY_IF( this->bAbsCoorChanged)
     {
       *this->absCoordinate = *this->absCoordinate + shift;
@@ -437 +424 @@
 float PNode::getSpeed()
 {
-#ifdef __unix__
-  if( G_UNLIKELY(this->time == 0))
-#else
-  if(this->time == 0)
-#endif
+  __UNLIKELY_IF( this->time == 0)
     return 1000;
   Vector diff;
@@ -471 +454 @@
 void PNode::addChild (PNode* pNode, int parentingMode)
 {
-  if( pNode->parent != NULL )
+
+  __UNLIKELY_IF( pNode->parent != NULL)
     {
       PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
@@ -585 +569 @@
   this->time = dt;
   PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
-  if(this->mode & PNODE_MOVEMENT )
-    {
-      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+
+
+  __LIKELY_IF( this->mode & PNODE_MOVEMENT)
+    {
+      __UNLIKELY_IF(this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
-      else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      __LIKELY_IF(this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+
         {
           /*this is bad style... must be deleted later - just for testing*/
-          if( this->parent == NULL)
+
+          /*
+          __UNLIKELY_IF( this->parent == NULL)
             {
               *this->absCoordinate = *this->relCoordinate;
             }
-          else
-            *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;       /* update the current absCoordinate */
+            else */
+          *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;         /* update the current absCoordinate */
         }
     }
@@ -606 +595 @@
   if( this->mode & PNODE_LOCAL_ROTATE)
     {
-      if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      __UNLIKELY_IF( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relDirection = *this->absDirection - parent->getAbsDir();
         }
-      else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      else __LIKELY_IF( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* update the current absDirection - remember * means rotation around sth.*/
@@ -620 +609 @@
   if( this->mode & PNODE_ROTATE_MOVEMENT)
     {
-      if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      __UNLIKELY_IF( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
-      else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      else __LIKELY_IF( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /*this is bad style... must be deleted later - just for testing*/
-          if( this->parent == NULL)
+          /*if( this->parent == NULL)
             *this->absCoordinate = *this->relCoordinate;
-          else
-            *this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(*this->relCoordinate);            /* update the current absCoordinate */
+            else*/
+          *this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(*this->relCoordinate);              /* update the current absCoordinate */
         }
     }
@@ -642 +631 @@
     { 
       /* if this node has changed, make sure, that all children are updated also */
-      if( this->bRelCoorChanged || this->bAbsCoorChanged)
+      __LIKELY_IF( this->bRelCoorChanged || this->bAbsCoorChanged)
         pn->parentCoorChanged ();
-      if( this->bRelDirChanged || this->bAbsDirChanged)
+      __LIKELY_IF( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();