Changeset 7731 in orxonox.OLD for branches/network

Timestamp:

May 19, 2006, 4:22:39 PM (19 years ago)

Author:

rennerc

Message:

fixed bug

Location:

branches/network/src

Files:

• lib/network/handshake.cc (modified) (3 diffs)
• lib/network/handshake.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (10 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (8 diffs)
• lib/network/synchronizeable_var/synchronizeable_var.cc (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (5 diffs)

branches/network/src/lib/network/handshake.cc

@@ -31 +31 @@
 
   this->setIsServer(server);
-  this->localState.hostId = clientId;
-  this->localState.networkManagerId = networkGameManagerId;
-  this->localState.messageManagerId = messageManagerId;
  
   orxId_handler = registerVarId( new SynchronizeableInt( &localState.orxId, &remoteState.orxId, "orxonoxId", PERMISSION_ALL ) );
   version_handler = registerVarId( new SynchronizeableInt( &localState.version, &remoteState.version, "version", PERMISSION_ALL ) );
   netManId_handler = registerVarId( new SynchronizeableInt( &localState.networkManagerId, &remoteState.networkManagerId, "networkManagerId", PERMISSION_ALL ) );
-  netManId_handler = registerVarId( new SynchronizeableInt( &localState.messageManagerId, &remoteState.messageManagerId, "networkManagerId", PERMISSION_ALL ) );
+  msgManId_handler = registerVarId( new SynchronizeableInt( &localState.messageManagerId, &remoteState.messageManagerId, "messageManagerId", PERMISSION_ALL ) );
   hostId_handler = registerVarId( new SynchronizeableInt( &localState.hostId, &remoteState.hostId, "hostId", PERMISSION_ALL ) );
   completed_handler = registerVarId( new SynchronizeableInt( &localState.completed, &remoteState.completed, "completed", PERMISSION_ALL ) );
@@ -49 +46 @@
   localState.hostId = clientId;
   localState.networkManagerId = networkGameManagerId;
+  this->localState.messageManagerId = messageManagerId;
   localState.orxId = _ORXONOX_ID;
   localState.version = _ORXONOX_VERSION;
@@ -57 +55 @@
   remoteState.hostId = -1;
   remoteState.networkManagerId = -1;
+  remoteState.messageManagerId = -1;
   remoteState.orxId = 0;
   remoteState.version = 0;

branches/network/src/lib/network/handshake.h

@@ -47 +47 @@
     
     int netManId_handler;
+    int msgManId_handler;
     int hostId_handler;
     int completed_handler;

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

@@ -412 +412 @@
       offset += INTSIZE;
 
-      n = sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, 0 );
+      n = sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, -1000 );
       offset += n;
       
@@ -421 +421 @@
     
     assert( peer->second.socket->writePacket( buf, offset ) );
+    peer->second.sentStateTicks[currentState] = SDL_GetTicks();
     PRINTF(0)("send packet: %d userId = %d\n", offset, peer->second.userId);
   }
@@ -461 +462 @@
       assert( Converter::byteArrayToInt( buf + 2*INTSIZE, &fromState ) == INTSIZE );
       assert( Converter::byteArrayToInt( buf + 3*INTSIZE, &ackedState ) == INTSIZE );
+      PRINTF(0)("ackedstate: %d\n", ackedState);
       offset = 4*INTSIZE;
 
@@ -475 +477 @@
         continue;
       }
-
+      
       while ( offset < length )
       {
@@ -485 +487 @@
       
         Synchronizeable * sync = NULL;
-      
+        
         for ( SynchronizeableList::iterator it = synchronizeables.begin(); it != synchronizeables.end(); it++ )
         { 
@@ -495 +497 @@
           }
         }
-      
+        
         if ( sync == NULL )
         {
@@ -503 +505 @@
             continue;
           }
-        
+
         //TODO dont accept new object from all peers (probably only servers)
           int leafClassId;
@@ -511 +513 @@
             continue;
           }
-        
+
           Converter::byteArrayToInt( buf + offset, &leafClassId );
         
@@ -532 +534 @@
             continue;
           }
-        
+
           if ( b->isA(CL_SYNCHRONIZEABLE) )
           {
@@ -550 +552 @@
         }
 
-        offset += sync->setStateDiff( peer->second.userId, buf+offset, length-offset, state, fromState );
+        offset += sync->setStateDiff( peer->second.userId, buf+offset, syncDataLength, state, fromState ); 
       }
-    
+      
       if ( offset != length )
       {
+        PRINTF(0)("offset (%d) != length (%d)\n", offset, length);
         peer->second.socket->disconnectServer();
       }
+      
+      if ( peer->second.sentStateTicks.find( ackedState ) != peer->second.sentStateTicks.end() )
+      {
+        peer->second.ackDelay.push_back( SDL_GetTicks() - peer->second.sentStateTicks[ackedState] );
+      }
+      
+      while ( peer->second.sentStateTicks.begin()->first <= ackedState )
+        peer->second.sentStateTicks.erase( peer->second.sentStateTicks.begin() );
+      
+      while ( peer->second.ackDelay.size() > 20 )
+        peer->second.ackDelay.erase( peer->second.ackDelay.begin() );
+      
+      peer->second.ping = 0;
+      
+      for ( std::list<int>::iterator it = peer->second.ackDelay.begin(); it != peer->second.ackDelay.end(); it++ )
+        peer->second.ping += *it;
+      
+      if ( peer->second.ackDelay.size() == 0 )
+        peer->second.ping = -1;
+      else
+        peer->second.ping /= peer->second.ackDelay.size();
+      
+      PRINTF(0)("PING: user: %d ping: %d\n", peer->second.userId, peer->second.ping );
     
       peer->second.lastAckedState = ackedState;
+      peer->second.lastRecvedState = state;
+      
     }
   

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

@@ -28 +28 @@
     PeerInfo() { clear(); }
     void clear() { userId = 0; isServer = false; socket = NULL; handshake = NULL; lastAckedState = 0; lastRecvedState = 0; }
-    int             userId;
-    bool            isServer;
-    NetworkSocket * socket;
-    Handshake *     handshake;
-    int             lastAckedState;
-    int             lastRecvedState;
+    int               userId;
+    bool              isServer;
+    NetworkSocket *   socket;
+    Handshake *       handshake;
+    int               lastAckedState;
+    int               lastRecvedState;
+    std::map<int,int> sentStateTicks;
+    std::list<int>    ackDelay;
+    int               ping;
 };
 

branches/network/src/lib/network/synchronizeable.cc

@@ -123 +123 @@
       if ( (*it2)->data != NULL )
       {
-        delete (*it2)->data;
+        delete [] (*it2)->data;
         (*it2)->data = NULL;
       }
@@ -154 +154 @@
   stateTo->stateId = stateId;
   stateTo->dataLength = neededSize;
-  stateTo->data = (byte*)malloc( neededSize );
+  stateTo->data = new byte[ neededSize ];
 
   std::list<int>::iterator sizeIter = stateFrom->sizeList.begin();
@@ -178 +178 @@
       stateTo->sizeList.push_back( n );
       i += n;
-    }
-    else if ( ! hasPermission )
-    {
-      for ( int j = 0; j < (*it)->getSize(); j++ )
-      {
-        //TODO this should be called!!!!!!!!!!1
-        assert(false);
-        stateTo->data[i] = 0;
-        i++;
-      }
     }
     else
@@ -240 +230 @@
   stateTo->stateId = stateId;
   stateTo->dataLength = length;
-  stateTo->data = (byte*)malloc( length );
+  stateTo->data = new byte[ length ];
 
   //remove old states
@@ -254 +244 @@
       if ( (*it2)->data != NULL )
       {
-        delete (*it2)->data;
+        delete [] (*it2)->data;
         (*it2)->data = NULL;
       }
@@ -290 +280 @@
     
   }
-
+  
   //add state to state history
   recvStates[userId].push_back( stateTo );
@@ -366 +356 @@
     {
       if ( (*it2)->data )
-        delete (*it2)->data;
+        delete [] (*it2)->data;
       (*it2)->data = NULL;
       
-      delete *it2;
+      delete [] *it2;
     }
   }
@@ -380 +370 @@
     {
       if ( (*it2)->data )
-        delete (*it2)->data;
+        delete [] (*it2)->data;
       (*it2)->data = NULL;
       
-      delete *it2;
+      delete [] *it2;
     }
   }

branches/network/src/lib/network/synchronizeable_var/synchronizeable_var.cc

@@ -36 +36 @@
   this->name = name;
   this->bWatched = false;
+  this->changed = false;
 }
 

branches/network/src/subprojects/network/network_unit_test.cc

@@ -220 +220 @@
   for( int i = 0; i < 3; i++)
   {
-    nm->synchronize();
+    nm->synchronize( 1000 );
     /* simulate the network delay */
     SDL_Delay(50);
@@ -237 +237 @@
 }
 
-void testCB( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+bool testCB( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
   printf("GOT MESSAGE: %s\n", data);
+  return true;
 }
 
@@ -273 +274 @@
   {
     MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"server to client", 18, RT_ALL, 0, MP_HIGHBANDWIDTH );
-    netMan->synchronize();
+    netMan->synchronize( 1000 );
     SDL_Delay(1000);
     ss->debug();
@@ -311 +312 @@
   for(;;)
   {
-    netMan->synchronize();
+    netMan->synchronize( 1000 );
     MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"client to server", 18, RT_ALL, 0, MP_HIGHBANDWIDTH );
     ss = dynamic_cast<SimpleSync*>(ClassList::getObject( "Server", CL_SIMPLE_SYNC ) );
@@ -355 +356 @@
   for(;;)
   {
-    netMan->synchronize();
+    netMan->synchronize( 1000 );
     SDL_Delay(10);
   }