Changeset 5961 for code/trunk

Timestamp:

Oct 16, 2009, 3:38:48 PM (15 years ago)

Author:

scheusso

Message:

new ConsoleCommand: printRTT: prints the round trip time to (the server / all clients)
small change in ClientDisconnection handling (only internal)

Location:

code/trunk/src/libraries/network

Files:

• Client.cc (modified) (1 diff)
• Client.h (modified) (1 diff)
• ClientConnection.cc (modified) (1 diff)
• ClientConnection.h (modified) (1 diff)
• ClientInformation.cc (modified) (2 diffs)
• Host.cc (modified) (2 diffs)
• Host.h (modified) (2 diffs)
• Server.cc (modified) (3 diffs)
• Server.h (modified) (1 diff)

code/trunk/src/libraries/network/Client.cc

@@ -111 +111 @@
     return true;
   }
+  
+  void Client::printRTT(){
+    COUT(0) << "Round trip time to server is " << ClientConnection::getRTT() << " ms" << endl;
+  }
 
   /**

code/trunk/src/libraries/network/Client.h

@@ -72 +72 @@
     virtual bool chat(const std::string& message);
     virtual bool broadcast(const std::string& message) { return false; }
+    virtual void printRTT();
 
     void update(const Clock& time);

code/trunk/src/libraries/network/ClientConnection.cc

@@ -146 +146 @@
     this->connectionClosed();
   }
+  
+  uint32_t ClientConnection::getRTT()
+  { 
+    assert(server_);
+    return server_->roundTripTime;
+  }
 
 }

code/trunk/src/libraries/network/ClientConnection.h

@@ -55 +55 @@
   protected:
     virtual void connectionClosed()=0;
+    uint32_t getRTT();
   private:
     virtual void addPeer(ENetEvent* event);

code/trunk/src/libraries/network/ClientInformation.cc

@@ -42 +42 @@
 #define WIN32_LEAN_AND_MEAN
 #include <enet/enet.h>
+#include "ClientConnectionListener.h"
 
 namespace orxonox
@@ -66 +67 @@
     if(this==head_)
       head_=next();
+    ClientConnectionListener::broadcastClientDisconnected( this->getID() );
   }
 

code/trunk/src/libraries/network/Host.cc

@@ -50 +50 @@
   assert(instance_==0);
   instance_=this;
+  this->printRTTCC_ = createConsoleCommand( createFunctor(&Host::printRTT, this), "printRTT" );
+  CommandExecutor::addConsoleCommandShortcut( this->printRTTCC_ );
 }
 
@@ -59 +61 @@
 {
   instance_=0;
+  if( this->printRTTCC_ )
+    delete this->printRTTCC_;
 }
 

code/trunk/src/libraries/network/Host.h

@@ -31 +31 @@
 
 #include "NetworkPrereqs.h"
+#include "core/CorePrereqs.h"
 
 namespace orxonox {
@@ -79 +80 @@
     static bool Broadcast(const std::string& message);
     static bool incomingChat(const std::string& message, unsigned int playerID);
+    virtual void printRTT()=0;
   private:
+    ConsoleCommand* printRTTCC_;
 };
 

code/trunk/src/libraries/network/Server.cc

@@ -164 +164 @@
    * @brief: returns ping time to client in milliseconds 
    */
-  unsigned int Server::getPing(unsigned int clientID){
+  unsigned int Server::getRTT(unsigned int clientID){
     assert(ClientInformation::findClient(clientID));
     return ClientInformation::findClient(clientID)->getRTT();
+  }
+  
+  void Server::printRTT()
+  {
+    for( ClientInformation* temp=ClientInformation::getBegin(); temp!=0; temp=temp->next() )
+      COUT(0) << "Round trip time to client with ID: " << temp->getID() << " is " << temp->getRTT() << " ms" << endl;
   }
 
@@ -299 +305 @@
     {
       //ServerConnection::disconnectClient( client );
-      ClientConnectionListener::broadcastClientDisconnected( client->getID() );
+      //ClientConnectionListener::broadcastClientDisconnected( client->getID() ); //this is done in ClientInformation now
       delete client;
     }
@@ -343 +349 @@
     GamestateManager::removeClient(client);
     // inform all the listeners
-    ClientConnectionListener::broadcastClientDisconnected(client->getID());
+    // ClientConnectionListener::broadcastClientDisconnected(client->getID()); // this is done in ClientInformation now
   }
 

code/trunk/src/libraries/network/Server.h

@@ -57 +57 @@
     bool queuePacket(ENetPacket *packet, int clientID);
     void update(const Clock& time);
-    unsigned int getPing(unsigned int clientID);
+    unsigned int getRTT(unsigned int clientID);
+    virtual void printRTT();
     double getPacketLoss(unsigned int clientID);
   protected: