Changeset 3302 for code/branches/netp6

Timestamp:

Jul 18, 2009, 5:13:38 PM (15 years ago)

Author:

scheusso

Message:

changed some debug output
removed some uneccessary "multi"threading
some enhancements in Connection

Location:

code/branches/netp6/src/network

Files:

• ClientInformation.h (modified) (1 diff)
• Connection.cc (modified) (2 diffs)
• GamestateManager.cc (modified) (3 diffs)
• Server.cc (modified) (6 diffs)
• Server.h (modified) (1 diff)
• packet/ClassID.cc (modified) (1 diff)
• packet/FunctionIDs.cc (modified) (1 diff)
• synchronisable/Synchronisable.cc (modified) (1 diff)
• synchronisable/SynchronisableSpecialisations.cc (modified) (1 diff)

code/branches/netp6/src/network/ClientInformation.h

@@ -87 +87 @@
     static ClientInformation *findClient(ENetAddress *address, bool look_backwards=false);
     static ClientInformation *getBegin(){return head_;}
+    static bool hasClients(){ return ClientInformation::head_!=0; }
 
     bool setSynched(bool s);

code/branches/netp6/src/network/Connection.cc

@@ -31 +31 @@
 #include <cassert>
 #include <enet/enet.h>
-#include <OgreTimer.h>
 #include "packet/Packet.h"
 
@@ -77 +76 @@
     
     assert(this->host_);
-    Ogre::Timer timer;
 
-    while( timer.getMilliseconds()<NETWORK_MAX_QUEUE_PROCESS_TIME && enet_host_service( this->host_, &event, NETWORK_WAIT_TIMEOUT ) > 0 )
+    while( enet_host_service( this->host_, &event, NETWORK_WAIT_TIMEOUT ) > 0 )
     {
       switch(event.type){

code/branches/netp6/src/network/GamestateManager.cc

@@ -99 +99 @@
 
   bool GamestateManager::processGamestates(){
+    if( this->gamestateQueue.empty() )
+        return true;
     std::map<unsigned int, packet::Gamestate*>::iterator it;
     // now push only the most recent gamestates we received (ignore obsolete ones)
@@ -141 +143 @@
       int cid = temp->getID(); //get client id
       
-      packet::Gamestate *gs;
       unsigned int gID = temp->getGamestateID();
       if(!reference)
@@ -242 +243 @@
 
     assert(curid==(unsigned int)GAMESTATEID_INITIAL || curid<gamestateID);
-    COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
+    COUT(5) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
     std::map<unsigned int, packet::Gamestate*>::iterator it;
     for(it = gamestateMap_[clientID].begin(); it!=gamestateMap_[clientID].end() && it->first<gamestateID; ){

code/branches/netp6/src/network/Server.cc

@@ -49 +49 @@
 #include "core/ObjectList.h"
 #include "core/Executor.h"
-#include "core/ThreadPool.h"
 #include "packet/Chat.h"
 #include "packet/ClassID.h"
@@ -71 +70 @@
   Server::Server() {
     this->timeSinceLastUpdate_=0;
-    this->threadPool_ = new ThreadPool();
   }
 
@@ -77 +75 @@
     this->setPort( port );
     this->timeSinceLastUpdate_=0;
-    this->threadPool_ = new ThreadPool();
   }
 
@@ -89 +86 @@
     this->setBindAddress( bindAddress );
     this->timeSinceLastUpdate_=0;
-    this->threadPool_ = new ThreadPool();
   }
 
@@ -96 +92 @@
   */
   Server::~Server(){
-    delete this->threadPool_;
   }
 
@@ -141 +136 @@
     // receive incoming packets
     Connection::processQueue();
-    // process incoming gamestates
-    GamestateManager::processGamestates();
     
-    // pass sendFunctionCalls to worker thread pool
-    ExecutorStatic* functioncalls = createExecutor( createFunctor(&FunctionCallManager::sendCalls) );
-    this->threadPool_->passFunction( functioncalls, true );
-    
-    this->threadPool_->synchronise();
-    
-    //this steers our network frequency
-    timeSinceLastUpdate_+=time.getDeltaTime();
-    if(timeSinceLastUpdate_>=NETWORK_PERIOD)
+    if ( ClientInformation::hasClients() )
     {
-      timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
-//       ExecutorMember<GamestateManager>* updategamestate = createExecutor( createFunctor(&GamestateManager::updateGamestate);
-//       updategamestate->setObject( static_cast<GamestateManager*>(this) );
-//       this->threadPool_->passFunction( updategamestate );
-      updateGamestate();
-    }
-    sendPackets(); // flush the enet queue
+      // process incoming gamestates
+      GamestateManager::processGamestates();
+      
+      // send function calls to clients
+      FunctionCallManager::sendCalls();
+      
+      //this steers our network frequency
+      timeSinceLastUpdate_+=time.getDeltaTime();
+      if(timeSinceLastUpdate_>=NETWORK_PERIOD)
+      {
+        timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
+        updateGamestate();
+      }
+      sendPackets(); // flush the enet queue
+    }
   }
 

code/branches/netp6/src/network/Server.h

@@ -76 +76 @@
     void syncClassid(unsigned int clientID);
 
-    ThreadPool* threadPool_;
     float timeSinceLastUpdate_;
   };

code/branches/netp6/src/network/packet/ClassID.cc

@@ -142 +142 @@
     classname = temp+2*sizeof(uint32_t);
     id=ClassByString( std::string((const char*)classname) );
-    COUT(0) << "processing classid: " << networkID << " name: " << classname << " id: " << id << std::endl;
+    COUT(3) << "processing classid: " << networkID << " name: " << classname << " id: " << id << std::endl;
     if(id==NULL){
       COUT(0) << "Recieved a bad classname" << endl;

code/branches/netp6/src/network/packet/FunctionIDs.cc

@@ -132 +132 @@
     stringsize = *(uint32_t*)(temp+sizeof(uint32_t));
     functionname = temp+2*sizeof(uint32_t);
-    COUT(0) << "processing functionid: " << networkID << " name: " << functionname << std::endl;
+    COUT(3) << "processing functionid: " << networkID << " name: " << functionname << std::endl;
     NetworkFunctionBase::setNetworkID((const char*)functionname, networkID);
     temp += 2*sizeof(uint32_t) + stringsize;

code/branches/netp6/src/network/synchronisable/Synchronisable.cc

@@ -96 +96 @@
       if (this->objectMode_ != 0x0 && (Host::running() && Host::isServer()))
         deletedObjects_.push(objectID);
-      // delete all Synchronisable Variables from syncList ( which are also in stringList )
-      for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
-        delete (*it);
-      syncList.clear();
-      stringList.clear();
-    }
+    }
+    // delete all Synchronisable Variables from syncList ( which are also in stringList )
+    for(std::vector<SynchronisableVariableBase*>::iterator it = syncList.begin(); it!=syncList.end(); it++)
+      delete (*it);
+    syncList.clear();
+    stringList.clear();
     std::map<uint32_t, Synchronisable*>::iterator it;
     it = objectMap_.find(objectID);

code/branches/netp6/src/network/synchronisable/SynchronisableSpecialisations.cc

@@ -38 +38 @@
 namespace orxonox{
   
-//   template <> void Synchronisable::registerVariable( const std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
-//   {
-//     if (bidirectional)
-//       syncList.push_back(new SynchronisableVariableBidirectional<const std::string>(variable, mode, cb));
-//     else
-//       syncList.push_back(new SynchronisableVariable<const std::string>(variable, mode, cb));
-//     stringList.push_back(syncList.back());
-//   }
-  
   template <> void Synchronisable::registerVariable( std::string& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
   {
+    SynchronisableVariableBase* sv;
     if (bidirectional)
-      syncList.push_back(new SynchronisableVariableBidirectional<const std::string>(variable, mode, cb));
+      sv = new SynchronisableVariableBidirectional<const std::string>(variable, mode, cb);
     else
-      syncList.push_back(new SynchronisableVariable<const std::string>(variable, mode, cb));
-    stringList.push_back(syncList.back());
+      sv = new SynchronisableVariable<const std::string>(variable, mode, cb);
+    syncList.push_back(sv);
+    stringList.push_back(sv);
   }