Changeset 3202 for code/branches/netp5/src/network/Connection.cc

Timestamp:

Jun 21, 2009, 12:27:19 AM (15 years ago)

Author:

scheusso

Message:

rest of the cleanup ( mostly client connection handling)
network is now single-threaded ( only in order to become multithreaded again, but thats another story )

File:

• code/branches/netp5/src/network/Connection.cc (modified) (4 diffs)

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

@@ -31 +31 @@
 #include <iostream>
 #include <cassert>
+#include <OgreTimer.h>
 
 #include "util/Debug.h"
@@ -48 +49 @@
     assert(instance_==0);
     Connection::instance_=this;
+    enet_initialize();
+    atexit(enet_deinitialize);
   }
 
@@ -72 +75 @@
     
     assert(this->host_);
+    Ogre::Timer timer;
 
-    if( enet_host_service( this->host_, &event, NETWORK_WAIT_TIMEOUT ) > 0 )
+    while( timer.getMilliseconds()<NETWORK_MAX_QUEUE_PROCESS_TIME && enet_host_service( this->host_, &event, NETWORK_WAIT_TIMEOUT ) > 0 )
     {
       switch(event.type){
@@ -81 +85 @@
           break;
         case ENET_EVENT_TYPE_DISCONNECT:
-          disconnectClient( &event );
+          disconnectPeer( &event );
           break;
         case ENET_EVENT_TYPE_RECEIVE: