summaryrefslogtreecommitdiffstats
path: root/src/Net/ThreadManager.h
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-05-20 01:08:16 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-05-20 01:08:16 +0200
commit776377bb21ee1cfe0bcdbc000f7c6fa0be227226 (patch)
treea60e8bdd92678dece5fbb96e75535eba2b61b7da /src/Net/ThreadManager.h
parentbadc0da3b74d99c90b7b28180d08cd6d08830254 (diff)
downloadmad-776377bb21ee1cfe0bcdbc000f7c6fa0be227226.tar
mad-776377bb21ee1cfe0bcdbc000f7c6fa0be227226.zip
Netzwerk-Code auf boost::asio umgestellt
Diffstat (limited to 'src/Net/ThreadManager.h')
-rw-r--r--src/Net/ThreadManager.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Net/ThreadManager.h b/src/Net/ThreadManager.h
index fd903af..2c57747 100644
--- a/src/Net/ThreadManager.h
+++ b/src/Net/ThreadManager.h
@@ -27,7 +27,8 @@
#include <queue>
#include <set>
-#include <boost/function.hpp>
+#include <boost/asio.hpp>
+
#include <boost/thread/thread.hpp>
#include <boost/thread/condition_variable.hpp>
#include <boost/thread/locks.hpp>
@@ -50,11 +51,14 @@ class ThreadManager : public Common::Initializable {
boost::condition_variable workCond;
std::queue<boost::function0<void> > work;
+ boost::scoped_ptr<boost::asio::io_service::work> ioWorker;
+
static ThreadManager threadManager;
ThreadManager() {}
void workerFunc();
+ void ioFunc();
void threadFinished(boost::thread *thread) {
threadLock.lock();