Changeset 7490 for code/trunk/src/libraries/network/packet/FunctionCalls.cc

Timestamp:

Sep 26, 2010, 6:41:19 PM (14 years ago)

Author:

scheusso

Message:

cleaning up function calls a bit in order to buffer calls for not (yet) existing objects

File:

• code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) (4 diffs)

code/trunk/src/libraries/network/packet/FunctionCalls.cc

@@ -30 +30 @@
 
 #include <cassert>
-#include <cstring>
-#include "util/MultiType.h"
-#include "network/NetworkFunction.h"
+#include "network/FunctionCall.h"
 
 namespace orxonox {
@@ -46 +44 @@
   flags_ = flags_ | PACKET_FLAGS_FUNCTIONCALLS;
   currentSize_ = 2*sizeof(uint32_t); // for packetid and nrOfCalls
-  nrOfCalls_ = 0;
-  currentMemBlocks_ = 1;
-  data_=new uint8_t[ FUNCTIONCALLS_MEM_ALLOCATION ];
-  *(Type::Value *)(data_ + _PACKETID ) = Type::FunctionCalls;
-  *(uint32_t*)(data_+sizeof(uint32_t)) = 0; // set nrOfCalls to 0
 }
 
@@ -65 +58 @@
 bool FunctionCalls::process(){
   assert(isDataENetAllocated());
+  
   uint8_t* temp = data_+sizeof(uint32_t); //skip packetid
-  this->nrOfCalls_ = *(uint32_t*)temp;
+  uint32_t nrOfCalls = *(uint32_t*)temp;
   temp += sizeof(uint32_t);
-  for( unsigned int i = 0; i<this->nrOfCalls_; i++ )
+  for( unsigned int i = 0; i<nrOfCalls; i++ )
   {
-    uint32_t functionID = *(uint32_t*)temp;
-    bool isStatic = *(uint8_t*)(temp+sizeof(uint32_t));
-    if( isStatic )
-    {
-      MultiType mt1, mt2, mt3, mt4, mt5;
-      NetworkFunctionStatic *fct = NetworkFunctionStatic::getFunction( functionID );
-      uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t));
-      temp+=2*sizeof(uint32_t)+sizeof(uint8_t);
-      switch(nrOfArguments)
-      {
-        case 0:
-          fct->call();
-          break;
-        case 1:
-          mt1.importData(temp);
-          fct->call(mt1);
-          break;
-        case 2:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          fct->call(mt1, mt2);
-          break;
-        case 3:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          mt3.importData(temp);
-          fct->call(mt1, mt2, mt3);
-          break;
-        case 4:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          mt3.importData(temp);
-          mt4.importData(temp);
-          fct->call(mt1, mt2, mt3, mt4);
-          break;
-        case 5:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          mt3.importData(temp);
-          mt4.importData(temp);
-          mt5.importData(temp);
-          fct->call(mt1, mt2, mt3, mt4, mt5);
-          break;
-        default:
-          assert(0);
-      }
-    }
-    else // not a static function, so also handle the objectID
-    {
-      MultiType mt1, mt2, mt3, mt4, mt5;
-      NetworkMemberFunctionBase *fct = NetworkMemberFunctionBase::getFunction( functionID );
-      uint32_t nrOfArguments = *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t));
-      uint32_t objectID = *(uint32_t*)(temp+2*sizeof(uint32_t)+sizeof(uint8_t));
-      temp+=3*sizeof(uint32_t)+sizeof(uint8_t);
-      switch(nrOfArguments)
-      {
-        case 0:
-          fct->call(objectID);
-          break;
-        case 1:
-          mt1.importData(temp);
-          fct->call(objectID, mt1);
-          break;
-        case 2:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          fct->call(objectID, mt1, mt2);
-          break;
-        case 3:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          mt3.importData(temp);
-          fct->call(objectID, mt1, mt2, mt3);
-          break;
-        case 4:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          mt3.importData(temp);
-          mt4.importData(temp);
-          fct->call(objectID, mt1, mt2, mt3, mt4);
-          break;
-        case 5:
-          mt1.importData(temp);
-          mt2.importData(temp);
-          mt3.importData(temp);
-          mt4.importData(temp);
-          mt5.importData(temp);
-          fct->call(objectID, mt1, mt2, mt3, mt4, mt5);
-          break;
-        default:
-          assert(0);
-          break;
-      }
-    }
+    FunctionCall fctCall;
+    fctCall.loadData(temp);
+    fctCall.execute();
   }
+  
   delete this;
   return true;
@@ -171 +75 @@
 void FunctionCalls::addCallStatic( uint32_t networkID, const MultiType* mt1, const MultiType* mt2, const MultiType* mt3, const MultiType* mt4, const MultiType* mt5){
   assert(!isDataENetAllocated());
-
-  // first determine the size that has to be reserved for this call
-  uint32_t callsize = 2*sizeof(uint32_t)+sizeof(uint8_t); //size for network-function-id and nrOfArguments and for bool isStatic
-  uint32_t nrOfArguments = 0;
-  if(mt1)
-  {
-    nrOfArguments++;
-    callsize += mt1->getNetworkSize();
-    if(mt2)
-    {
-      nrOfArguments++;
-      callsize += mt2->getNetworkSize();
-      if(mt3)
-      {
-        nrOfArguments++;
-        callsize += mt3->getNetworkSize();
-        if(mt4)
-        {
-          nrOfArguments++;
-          callsize += mt4->getNetworkSize();
-          if(mt5)
-          {
-            nrOfArguments++;
-            callsize += mt5->getNetworkSize();
-          }
-        }
-      }
-    }
-  }
-
-  // now allocated mem if neccessary
-  if( currentSize_ + callsize > currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION )
-  {
-    currentMemBlocks_ = (currentSize_ + callsize)%FUNCTIONCALLS_MEM_ALLOCATION+1;
-    uint8_t *temp = new uint8_t[currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION];
-    memcpy( temp, data_, currentSize_ );
-    delete[] data_;
-    data_ = temp;
-  }
-
-  // now serialise the mt values and copy the function id and isStatic
-  uint8_t* temp = data_+currentSize_;
-  *(uint32_t*)(data_+sizeof(uint32_t)) = *(uint32_t*)(data_+sizeof(uint32_t))+1; // increase number of calls
-  *(uint32_t*)temp = networkID;
-  *(uint8_t*)(temp+sizeof(uint32_t)) = true;
-  *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t)) = nrOfArguments;
-  temp += 2*sizeof(uint32_t)+sizeof(uint8_t);
-  if(mt1)
-  {
-    mt1->exportData( temp ); //temp gets automatically increased
-    if(mt2)
-    {
-      mt2->exportData( temp ); //temp gets automatically increased
-      if(mt3)
-      {
-        mt3->exportData( temp ); //temp gets automatically increased
-        if(mt4)
-        {
-          mt4->exportData( temp ); //temp gets automatically increased
-          if(mt5)
-          {
-            mt5->exportData( temp ); //temp gets automatically increased
-          }
-        }
-      }
-    }
-  }
-  //currentSize_ += callsize;
-  currentSize_ = temp-data_;
-
+  
+  this->functionCalls_.push(orxonox::FunctionCall());
+  this->functionCalls_.back().setCallStatic( networkID, mt1, mt2, mt3, mt4, mt5 );
+  this->currentSize_ += this->functionCalls_.back().getSize();
 }
 
 void FunctionCalls::addCallMember( uint32_t networkID, uint32_t objectID, const MultiType* mt1, const MultiType* mt2, const MultiType* mt3, const MultiType* mt4, const MultiType* mt5){
   assert(!isDataENetAllocated());
+  
+  this->functionCalls_.push(orxonox::FunctionCall());
+  this->functionCalls_.back().setCallMember( networkID, objectID, mt1, mt2, mt3, mt4, mt5 );
+  this->currentSize_ += this->functionCalls_.back().getSize();
+}
 
-  // first determine the size that has to be reserved for this call
-  uint32_t callsize = 3*sizeof(uint32_t)+sizeof(uint8_t); //size for network-function-id and nrOfArguments and the objectID
-  uint32_t nrOfArguments = 0;
-  if(mt1)
+bool FunctionCalls::send()
+{
+  assert(this->functionCalls_.size());
+  data_=new uint8_t[ currentSize_ ];
+  *(Type::Value *)(data_ + _PACKETID ) = Type::FunctionCalls; // Set the Packet ID
+  *(uint32_t*)(data_+sizeof(uint32_t)) = this->functionCalls_.size(); // set nrOfCalls to 0
+  uint8_t* temp = data_+2*sizeof(uint32_t);
+  
+  while( this->functionCalls_.size() )
   {
-    nrOfArguments++;
-    callsize += mt1->getNetworkSize();
-    if(mt2)
-    {
-      nrOfArguments++;
-      callsize += mt2->getNetworkSize();
-      if(mt3)
-      {
-        nrOfArguments++;
-        callsize += mt3->getNetworkSize();
-        if(mt4)
-        {
-          nrOfArguments++;
-          callsize += mt4->getNetworkSize();
-          if(mt5)
-          {
-            nrOfArguments++;
-            callsize += mt5->getNetworkSize();
-          }
-        }
-      }
-    }
+    this->functionCalls_.front().saveData( temp );
+    this->functionCalls_.pop();
   }
+  
+  assert( temp==data_+currentSize_ );
+  
+  Packet::send();
+  return true;
+}
 
-  // now allocated mem if neccessary
-  if( currentSize_ + callsize > currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION )
-  {
-    currentMemBlocks_ = (currentSize_ + callsize)%FUNCTIONCALLS_MEM_ALLOCATION+1;
-    uint8_t *temp = new uint8_t[currentMemBlocks_*FUNCTIONCALLS_MEM_ALLOCATION];
-    memcpy( temp, data_, currentSize_ );
-    delete[] data_;
-    data_ = temp;
-  }
-
-  // now serialise the mt values and copy the function id
-  uint8_t* temp = data_+currentSize_;
-  *(uint32_t*)(data_+sizeof(uint32_t)) = *(uint32_t*)(data_+sizeof(uint32_t))+1; // increase number of calls
-  *(uint32_t*)temp = networkID;
-  *(uint8_t*)(temp+sizeof(uint32_t)) = false;
-  *(uint32_t*)(temp+sizeof(uint32_t)+sizeof(uint8_t)) = nrOfArguments;
-  *(uint32_t*)(temp+2*sizeof(uint32_t)+sizeof(uint8_t)) = objectID;
-  temp += 3*sizeof(uint32_t)+sizeof(uint8_t);
-  if(mt1)
-  {
-    mt1->exportData( temp ); //temp gets automatically increased
-    if(mt2)
-    {
-      mt2->exportData( temp ); //temp gets automatically increased
-      if(mt3)
-      {
-        mt3->exportData( temp ); //temp gets automatically increased
-        if(mt4)
-        {
-          mt4->exportData( temp ); //temp gets automatically increased
-          if(mt5)
-          {
-            mt5->exportData( temp ); //temp gets automatically increased
-          }
-        }
-      }
-    }
-  }
-  currentSize_ += callsize;
-
-}