Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-26 18:36:30 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-26 18:36:30 (GMT) |
| commit | 256f9df327d13447ec110bbaebe813b86e57a610 (patch) | |
| tree | da58c29d58b3695406fc323ebc54483c0978d536 /Swiften/Network/BoostIOServiceThread.cpp | |
| parent | c27c75917aea053baaa884638a3c056666a05602 (diff) | |
| download | swift-256f9df327d13447ec110bbaebe813b86e57a610.zip swift-256f9df327d13447ec110bbaebe813b86e57a610.tar.bz2 | |
Make boost io_service a shared object.
This should avoid problems when destroying an event loop containing
timer or network events, after the network factory (and io_service
object) has disappeared (i.e. at shutdown).
Diffstat (limited to 'Swiften/Network/BoostIOServiceThread.cpp')
| -rw-r--r-- | Swiften/Network/BoostIOServiceThread.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Swiften/Network/BoostIOServiceThread.cpp b/Swiften/Network/BoostIOServiceThread.cpp index 50fe9a8..031e7b5 100644 --- a/Swiften/Network/BoostIOServiceThread.cpp +++ b/Swiften/Network/BoostIOServiceThread.cpp @@ -6,19 +6,24 @@ #include "Swiften/Network/BoostIOServiceThread.h" +#include <boost/smart_ptr/make_shared.hpp> + namespace Swift { -BoostIOServiceThread::BoostIOServiceThread() : thread_(boost::bind(&BoostIOServiceThread::doRun, this)) { +BoostIOServiceThread::BoostIOServiceThread() { + ioService_ = boost::make_shared<boost::asio::io_service>(); + thread_ = new boost::thread(boost::bind(&BoostIOServiceThread::doRun, this)); } BoostIOServiceThread::~BoostIOServiceThread() { - ioService_.stop(); - thread_.join(); + ioService_->stop(); + thread_->join(); + delete thread_; } void BoostIOServiceThread::doRun() { - boost::asio::io_service::work work(ioService_); - ioService_.run(); + boost::asio::io_service::work work(*ioService_); + ioService_->run(); } } |