Changeset 1279 for code/branches/merge

Timestamp:

May 15, 2008, 11:42:50 AM (17 years ago)

Author:

scheusso

Message:

adapted boost threads in clientconnection
added trap to runscript (xset r, autorepeat)
had to change assff back to assf3 due to some network issues

Location:

code/branches/merge

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• bin/run-script (modified) (1 diff)
• src/network/ClientConnection.cc (modified) (5 diffs)
• src/network/ClientConnection.h (modified) (2 diffs)

code/branches/merge/bin/levels/sample.oxw

@@ -11 +11 @@
 <!--Ambient colourvalue="1,1,1" /-->
 <Skybox src="Orxonox/StarSkyBox" />
-<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
+<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assf3.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
 
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

code/branches/merge/bin/run-script

@@ -22 +22 @@
         fi
 fi
+trap "xset r" EXIT HUP INT TERM ABRT
 exec ./orxonox $@

code/branches/merge/src/network/ClientConnection.cc

@@ -42 +42 @@
 #include <iostream>
 // boost.thread library for multithreading support
-#include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
 
@@ -50 +49 @@
 namespace network
 {
-  static boost::thread_group network_threads;
+  //static boost::thread_group network_threads;
 
   ClientConnection::ClientConnection(int port, std::string address) {
@@ -96 +95 @@
 
   bool ClientConnection::createConnection() {
-    network_threads.create_thread(boost::bind(boost::mem_fn(&ClientConnection::receiverThread), this));
+    receiverThread_ = new boost::thread(boost::bind(&ClientConnection::receiverThread, this));
+    //network_threads.create_thread(boost::bind(boost::mem_fn(&ClientConnection::receiverThread), this));
     // wait 10 seconds for the connection to be established
     return waitEstablished(10000);
@@ -103 +103 @@
   bool ClientConnection::closeConnection() {
     quit=true;
-    network_threads.join_all();
+    //network_threads.join_all();
+    receiverThread_->join();
     established=false;
     return true;
@@ -179 +180 @@
         continue;
       }
+      //receiverThread_->yield();
     }
     // now disconnect

code/branches/merge/src/network/ClientConnection.h

@@ -45 +45 @@
 #include <string>
 #include <enet/enet.h>
+#include <boost/thread/thread.hpp>
 
 #include "PacketBuffer.h"
@@ -93 +94 @@
     // clientlist
     ENetPeer *server;
+    boost::thread *receiverThread_;
   };