Changeset 6503 in orxonox.OLD

Timestamp:

Jan 11, 2006, 11:54:32 PM (18 years ago)

Author:

rennerc

Message:

networkGameManager now copies data to one buffer for each client

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (13 diffs)
• lib/network/network_game_manager.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (2 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -52 +52 @@
   this->setClassID(CL_NETWORK_GAME_MANAGER, "NetworkGameManager");
 
-  allOutBuffer.length = 0;
-
-  allOutBuffer.maxLength = 10*1024;
-
-  allOutBuffer.buffer = new byte[10*1024];
-
   newUniqueID = MAX_CONNECTIONS + 2;
 
@@ -74 +68 @@
   }
 
-  if ( allOutBuffer.buffer )
-    delete allOutBuffer.buffer;
 }
 
@@ -107 +99 @@
       if ( b == CREATE_ENTITY )
       {
+        PRINTF(0)("CREATE_ENTITY\n");
         if ( !handleCreateEntity( i, data, length, sender ) )
           return i;
@@ -188 +181 @@
   }
 
-  *reciever = 0;
-  int nbytes = allOutBuffer.length;
-  allOutBuffer.length = 0;
-
-  if ( nbytes <=0 )
-    return 0;
-
-  if ( nbytes > maxLength )
-  {
-    PRINTF(1)("OutBuffer.length (%d) > (%d) networkStreamBuffer.length\n", nbytes, maxLength);
-    return 0;
-  }
-
-  memcpy( data, allOutBuffer.buffer, nbytes );
-  return nbytes;
+  return 0;
 }
 
@@ -221 +200 @@
 int NetworkGameManager::createEntity( ClassID classID, int owner )
 {
-
   if ( this->isServer() )
   {
@@ -254 +232 @@
       return NULL;
     }
-    newUniqueID++;
 
     BaseObject * b = Factory::fabricate( element );
@@ -268 +245 @@
     {
       Synchronizeable * s = dynamic_cast<Synchronizeable*>(b);
-      s->setUniqueID( newUniqueID );
+      s->setUniqueID( newUniqueID++ );
       s->setOwner( 0 );
       this->networkStream->connectSynchronizeable( *s );
@@ -313 +290 @@
 void NetworkGameManager::requestCreateEntity(ClassID classID)
 {
-  if ( !writeToClientBuffer( allOutBuffer, (byte)REQUEST_CREATE ) )
-    return;
-  if ( !writeToClientBuffer( allOutBuffer, (int)classID ) )
-    return;
+  for ( int i = 0; i<outBuffer.size(); i++)
+  {
+    if ( !this->networkStream->isUserIdActive( i ) )
+      continue;
+
+    if ( !writeToClientBuffer( outBuffer[i], (byte)REQUEST_CREATE ) )
+      return;
+    if ( !writeToClientBuffer( outBuffer[i], (int)classID ) )
+      return;
+  }
 }
 
@@ -325 +308 @@
 void NetworkGameManager::requestRemoveEntity(int uniqueID)
 {
-  if ( !writeToClientBuffer( allOutBuffer, (byte)REQUEST_REMOVE ) )
-    return;
-  if ( !writeToClientBuffer( allOutBuffer, uniqueID ) )
-    return;
+  for ( int i = 0; i<outBuffer.size(); i++)
+  {
+    if ( !this->networkStream->isUserIdActive( i ) )
+      continue;
+
+    if ( !writeToClientBuffer( outBuffer[i], (byte)REQUEST_REMOVE ) )
+      return;
+    if ( !writeToClientBuffer( outBuffer[i], uniqueID ) )
+      return;
+  }
 }
 
@@ -338 +327 @@
 int NetworkGameManager::executeCreateEntity(ClassID classID, int uniqueID, int owner)
 {
-  if ( !writeToClientBuffer( allOutBuffer, (byte)CREATE_ENTITY ) )
-    return -1;
-  if ( !writeToClientBuffer( allOutBuffer, (int)classID ) )
-    return -1;
-  if ( !writeToClientBuffer( allOutBuffer, uniqueID ) )
-    return -1;
-  if ( !writeToClientBuffer( allOutBuffer, owner ) )
-    return -1;
+  for ( int i = 0; i<outBuffer.size(); i++)
+  {
+    if ( !this->networkStream->isUserIdActive( i ) )
+      continue;
+
+    if ( !writeToClientBuffer( outBuffer[i], (byte)CREATE_ENTITY ) )
+      return -1;
+    if ( !writeToClientBuffer( outBuffer[i], (int)classID ) )
+      return -1;
+    if ( !writeToClientBuffer( outBuffer[i], uniqueID ) )
+      return -1;
+    if ( !writeToClientBuffer( outBuffer[i], owner ) )
+      return -1;
+  }
 
   doCreateEntity( classID, uniqueID, owner );
@@ -359 +354 @@
 void NetworkGameManager::executeRemoveEntity(int uniqueID)
 {
-  if ( !writeToClientBuffer( allOutBuffer, (byte)REMOVE_ENTITY ) )
-    return;
-  if ( !writeToClientBuffer( allOutBuffer, uniqueID ) )
-    return;
+  for ( int i = 0; i<outBuffer.size(); i++)
+  {
+    if ( !this->networkStream->isUserIdActive( i ) )
+      continue;
+
+    if ( !writeToClientBuffer( outBuffer[i], (byte)REMOVE_ENTITY ) )
+      return;
+    if ( !writeToClientBuffer( outBuffer[i], uniqueID ) )
+      return;
+  }
 
   doRemoveEntity(uniqueID);
@@ -406 +407 @@
   while ( it != e )
   {
-
+    PRINTF(5)("SENDING ENTITY %s id %d\n", (*it)->getClassName(), (*it)->getUniqueID() );
     if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getLeafClassID()) ) )
       return;
@@ -426 +427 @@
 bool NetworkGameManager::signalNewPlayer(int userId)
 {
+  if ( userId >= outBuffer.size() )
+    resizeBufferVector( userId );
 
   /* create new playable for Player*/

branches/network/src/lib/network/network_game_manager.h

@@ -122 +122 @@
   private:
     std::vector<clientBuffer>     outBuffer;
-    clientBuffer                  allOutBuffer;
+    //clientBuffer                  allOutBuffer;
     static NetworkGameManager*    singletonRef;
 

branches/network/src/lib/network/network_stream.cc

@@ -78 +78 @@
   this->connectionMonitor = new ConnectionMonitor();
   this->networkSockets.push_back( NULL );
+  this->networkSockets[0] = NULL; //TODO: remove this
   this->handshakes.push_back( NULL );
   this->bActive = true;
@@ -266 +267 @@
             if ( networkSockets[i] != NULL )
             {
-              PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever);
+              PRINTF(5)("write %d bytes to socket %d\n", dataLength, i);
               networkSockets[i]->writePacket(downBuffer, dataLength);
             }

branches/network/src/lib/network/network_stream.h

@@ -55 +55 @@
     inline int getSyncCount(){ return synchronizeables.size(); }
 
+    inline bool isUserIdActive( int userID ) { if (userID>=networkSockets.size()) return false; else return networkSockets[userID]!=NULL; }
+
   private:
     NetworkProtocol*       networkProtocol;

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -539 +539 @@
   }
 
+  return SYNCHELP_READ_N;
+
   if ( b == DATA_flags && this->getHostID()!=this->getOwner() )
   {
@@ -591 +593 @@
   }
 
+  return 0;
 
   *reciever = 0;