Changeset 7743 for code/branches

Timestamp:

Dec 8, 2010, 5:13:03 PM (14 years ago)

Author:

smerkli

Message:

made mastserserver mode non-blocking

Location:

code/branches/presentation/src

Files:

• libraries/network/MasterServer.cc (modified) (2 diffs)
• orxonox/Main.cc (modified) (1 diff)
• orxonox/gamestates/GSMasterServer.cc (modified) (1 diff)

code/branches/presentation/src/libraries/network/MasterServer.cc

@@ -220 +220 @@
     }
 
-    /* tell people we're now initialized and blocking. */
-    COUT(0) << "MasterServer initialized, waiting for connections.\n";
     
-    /* endless loop until we quit */
-    while( this->quit == false )
-    {
-      /* create an iterator for the loop */
-      while( enet_host_service( this->server, event, 1000 ) >= 0 )
-      { /* check what type of event it is and react accordingly */
-        switch (event->type)
-        { /* new connection */
-          case ENET_EVENT_TYPE_CONNECT: 
-            eventConnect( event ); break;
-
-            /* disconnect */
-          case ENET_EVENT_TYPE_DISCONNECT: 
-            eventDisconnect( event ); break;
-
-            /* incoming data */
-          case ENET_EVENT_TYPE_RECEIVE: eventData( event ); break;
-          default: break;
-        }
-      }
+    /* create an iterator for the loop */
+    enet_host_service( this->server, event, 100 );
+
+    /* check what type of event it is and react accordingly */
+    switch (event->type)
+    { /* new connection */
+      case ENET_EVENT_TYPE_CONNECT: 
+        eventConnect( event ); break;
+
+        /* disconnect */
+      case ENET_EVENT_TYPE_DISCONNECT: 
+        eventDisconnect( event ); break;
+
+        /* incoming data */
+      case ENET_EVENT_TYPE_RECEIVE: eventData( event ); break;
+      default: break;
     }
 
@@ -283 +277 @@
     //this->mainlist = new ServerList();
     this->peers = new PeerList();
+
+    /* tell people we're now initialized */
+    COUT(0) << "MasterServer initialized, waiting for connections.\n";
   }
 

code/branches/presentation/src/orxonox/Main.cc

@@ -77 +77 @@
             "  standalone,server,client"
             "   level"
-            " server,client"
+            " server,client,masterserver"
             "  level"
             );

code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc

@@ -63 +63 @@
 
   void GSMasterServer::update(const Clock& time)
-  { /* nothing so far */ }
+  { 
+    this->mserver->run();
+  }
 }