Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-23 11:14:50 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-08-11 16:24:53 (GMT) |
| commit | 9315a4acce26b3913eac6ea84e13a67e15281df1 (patch) | |
| tree | ef7ceaa62f9fbe732e606773de2855644bdb0950 /Swiften/Network/BoostTimer.cpp | |
| parent | 22ea5735ad1a105a4294b7475aba58646ef3ee8a (diff) | |
| download | swift-9315a4acce26b3913eac6ea84e13a67e15281df1.zip swift-9315a4acce26b3913eac6ea84e13a67e15281df1.tar.bz2 | |
Make access to deadline_timer thread-safe
According to boost doucmentation shared deadline_timers are not
thread-safe. Adding a mutext to protect access to
boost::asio::deadline_timer instance in Swift::BoostTimer.
This fixes a data-race reported by TSAN when running
Swiften/QA/ClientTest/ClientTest.
Test-Information:
Verified that the data-race report is gone with this fix.
Change-Id: I62c8c3a07d6ea16fe6e2d24c879340040406699b
Diffstat (limited to 'Swiften/Network/BoostTimer.cpp')
| -rw-r--r-- | Swiften/Network/BoostTimer.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Swiften/Network/BoostTimer.cpp b/Swiften/Network/BoostTimer.cpp index dd6bd0d..30f5180 100644 --- a/Swiften/Network/BoostTimer.cpp +++ b/Swiften/Network/BoostTimer.cpp | |||
| @@ -1,30 +1,44 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <Swiften/Network/BoostTimer.h> | 7 | #include <Swiften/Network/BoostTimer.h> |
| 8 | 8 | ||
| 9 | #include <boost/date_time/posix_time/posix_time.hpp> | ||
| 10 | #include <boost/asio.hpp> | 9 | #include <boost/asio.hpp> |
| 11 | #include <boost/bind.hpp> | 10 | #include <boost/bind.hpp> |
| 11 | #include <boost/date_time/posix_time/posix_time.hpp> | ||
| 12 | 12 | ||
| 13 | #include <Swiften/EventLoop/EventLoop.h> | 13 | #include <Swiften/EventLoop/EventLoop.h> |
| 14 | 14 | ||
| 15 | namespace Swift { | 15 | namespace Swift { |
| 16 | 16 | ||
| 17 | BoostTimer::BoostTimer(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) : | 17 | BoostTimer::BoostTimer(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) : |
| 18 | timeout(milliseconds), ioService(service), timer(*service), eventLoop(eventLoop) { | 18 | timeout(milliseconds), ioService(service), eventLoop(eventLoop) { |
| 19 | timer.reset(new boost::asio::deadline_timer(*service)); | ||
| 20 | } | ||
| 21 | |||
| 22 | BoostTimer::~BoostTimer() { | ||
| 23 | { | ||
| 24 | boost::mutex::scoped_lock lockTimer(timerMutex); | ||
| 25 | timer.reset(); | ||
| 26 | } | ||
| 19 | } | 27 | } |
| 20 | 28 | ||
| 21 | void BoostTimer::start() { | 29 | void BoostTimer::start() { |
| 22 | timer.expires_from_now(boost::posix_time::milliseconds(timeout)); | 30 | { |
| 23 | timer.async_wait(boost::bind(&BoostTimer::handleTimerTick, shared_from_this(), boost::asio::placeholders::error)); | 31 | boost::mutex::scoped_lock lockTimer(timerMutex); |
| 32 | timer->expires_from_now(boost::posix_time::milliseconds(timeout)); | ||
| 33 | timer->async_wait(boost::bind(&BoostTimer::handleTimerTick, shared_from_this(), boost::asio::placeholders::error)); | ||
| 34 | } | ||
| 24 | } | 35 | } |
| 25 | 36 | ||
| 26 | void BoostTimer::stop() { | 37 | void BoostTimer::stop() { |
| 27 | timer.cancel(); | 38 | { |
| 39 | boost::mutex::scoped_lock lockTimer(timerMutex); | ||
| 40 | timer->cancel(); | ||
| 41 | } | ||
| 28 | eventLoop->removeEventsFromOwner(shared_from_this()); | 42 | eventLoop->removeEventsFromOwner(shared_from_this()); |
| 29 | } | 43 | } |
| 30 | 44 | ||