Changeset 2773 for code/trunk/src/network/ClientConnection.cc

Timestamp:

Mar 11, 2009, 4:06:31 PM (15 years ago)

Author:

rgrieder

Message:

Removed all enet and boost includes from header files in the network library.

• Reduces dependencies
• Minimises problems with windows.h
• Speeds up the compiling process a little bit (probably negligible)
• Also removes ugly WIN32_LEAN_AND_MEAN declarations before every enet.h include in the network library.

Removed windows.h header from util/Sleep.h by adding Sleep.cc

File:

• code/trunk/src/network/ClientConnection.cc (modified) (11 diffs)

code/trunk/src/network/ClientConnection.cc

@@ -40 +40 @@
 #include "ClientConnection.h"
 
+#include <enet/enet.h>
 #include <iostream>
 // boost.thread library for multithreading support
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "util/Sleep.h"
@@ -52 +54 @@
   //static boost::thread_group network_threads;
 
-  boost::recursive_mutex ClientConnection::enet_mutex_;
+  static boost::recursive_mutex enet_mutex_g;
 
   ClientConnection::ClientConnection(int port, const std::string& address) {
     quit=false;
     server=NULL;
-    enet_address_set_host(&serverAddress, address.c_str());
-    serverAddress.port = port;
+    serverAddress = new ENetAddress();
+    enet_address_set_host(serverAddress, address.c_str());
+    serverAddress->port = port;
     established=false;
   }
@@ -65 +68 @@
     quit=false;
     server=NULL;
-    enet_address_set_host(&serverAddress, address);
-    serverAddress.port = port;
+    serverAddress = new ENetAddress();
+    enet_address_set_host(serverAddress, address);
+    serverAddress->port = port;
     established=false;
   }
@@ -80 +84 @@
     if(established)
       closeConnection();
+    delete serverAddress; // surely was created
   }
 
@@ -116 +121 @@
       return false;
     }
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
     if(enet_peer_send(server, 0, packet)<0)
       return false;
@@ -126 +131 @@
     if(server==NULL)
       return false;
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
     enet_host_flush(client);
     lock.unlock();
@@ -137 +142 @@
     ENetEvent *event;
     {
-      boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+      boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
       enet_initialize();
       client = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0);
@@ -158 +163 @@
       //std::cout << "connection loop" << std::endl;
       {
-        boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+        boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
         if(enet_host_service(client, event, NETWORK_CLIENT_WAIT_TIME)<0){
           // we should never reach this point
@@ -192 +197 @@
     if(!disconnectConnection())
       // if disconnecting failed destroy conn.
-      boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+      boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
       enet_peer_reset(server);
     return;
@@ -199 +204 @@
   bool ClientConnection::disconnectConnection() {
     ENetEvent event;
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
     enet_peer_disconnect(server, 0);
     while(enet_host_service(client, &event, NETWORK_CLIENT_WAIT_TIME) > 0){
@@ -220 +225 @@
     ENetEvent event;
     // connect to peer (server is type ENetPeer*)
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
-    server = enet_host_connect(client, &serverAddress, NETWORK_CLIENT_CHANNELS);
+    boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
+    server = enet_host_connect(client, serverAddress, NETWORK_CLIENT_CHANNELS);
     if(server==NULL) {
       COUT(2) << "ClientConnection: server == NULL" << std::endl;