summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2015-09-17 18:21:44 (GMT)
committerSwift Review <review@swift.im>2015-12-17 08:58:51 (GMT)
commit9bce26254aa3c2feffdd751b59cdee5e903fd2bc (patch)
tree27bf31b4564216db6bf74818dc76f0ba23af074e /Swiften/Network/BoostIOServiceThread.h
parentbea3559998c0ae0a2afca566046f08d0a201c0b2 (diff)
downloadswift-9bce26254aa3c2feffdd751b59cdee5e903fd2bc.zip
swift-9bce26254aa3c2feffdd751b59cdee5e903fd2bc.tar.bz2
Add event loop for integration in Boost ASIO
This allows execution of events inside an existing io_service if an application is already using Boost ASIO for other things and can share the io_service. Test-Information: Builds on OS X 10.11.2. Change-Id: I092ed7a25b24ef95d4664bae98ed84cc0f149073
Diffstat (limited to 'Swiften/Network/BoostIOServiceThread.h')
-rw-r--r--Swiften/Network/BoostIOServiceThread.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/Swiften/Network/BoostIOServiceThread.h b/Swiften/Network/BoostIOServiceThread.h
index 37047d1..428837b 100644
--- a/Swiften/Network/BoostIOServiceThread.h
+++ b/Swiften/Network/BoostIOServiceThread.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -15,7 +15,15 @@
namespace Swift {
class SWIFTEN_API BoostIOServiceThread {
public:
- BoostIOServiceThread();
+ /**
+ * Construct the object.
+ * @param ioService If this optional parameter is provided, the behaviour
+ * of this class changes completely - it no longer spawns its own thread
+ * and instead acts as a simple wrapper of the io_service. Use this if
+ * you are re-using an io_service from elsewhere (particularly if you
+ * are using the BoostASIOEventLoop).
+ */
+ BoostIOServiceThread(boost::shared_ptr<boost::asio::io_service> ioService = boost::shared_ptr<boost::asio::io_service>());
~BoostIOServiceThread();
boost::shared_ptr<boost::asio::io_service> getIOService() const {