summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-01-26 18:36:30 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-01-26 18:36:30 (GMT)
commit256f9df327d13447ec110bbaebe813b86e57a610 (patch)
treeda58c29d58b3695406fc323ebc54483c0978d536 /Swiften/Network/BoostConnection.h
parentc27c75917aea053baaa884638a3c056666a05602 (diff)
downloadswift-contrib-256f9df327d13447ec110bbaebe813b86e57a610.zip
swift-contrib-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/BoostConnection.h')
-rw-r--r--Swiften/Network/BoostConnection.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Network/BoostConnection.h b/Swiften/Network/BoostConnection.h
index 7b15966..506eedf 100644
--- a/Swiften/Network/BoostConnection.h
+++ b/Swiften/Network/BoostConnection.h
@@ -29,7 +29,7 @@ namespace Swift {
~BoostConnection();
- static ref create(boost::asio::io_service* ioService, EventLoop* eventLoop) {
+ static ref create(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
return ref(new BoostConnection(ioService, eventLoop));
}
@@ -45,7 +45,7 @@ namespace Swift {
HostAddressPort getLocalAddress() const;
private:
- BoostConnection(boost::asio::io_service* ioService, EventLoop* eventLoop);
+ BoostConnection(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
void handleConnectFinished(const boost::system::error_code& error);
void handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred);
@@ -55,6 +55,7 @@ namespace Swift {
private:
EventLoop* eventLoop;
+ boost::shared_ptr<boost::asio::io_service> ioService;
boost::asio::ip::tcp::socket socket_;
std::vector<char> readBuffer_;
boost::mutex writeMutex_;