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.h | |
| 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.h')
| -rw-r--r-- | Swiften/Network/BoostTimer.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/Network/BoostTimer.h b/Swiften/Network/BoostTimer.h index 1562887..a246b75 100644 --- a/Swiften/Network/BoostTimer.h +++ b/Swiften/Network/BoostTimer.h | |||
| @@ -4,13 +4,15 @@ | |||
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <boost/asio/io_service.hpp> | ||
| 10 | #include <boost/asio/deadline_timer.hpp> | 9 | #include <boost/asio/deadline_timer.hpp> |
| 10 | #include <boost/asio/io_service.hpp> | ||
| 11 | #include <boost/enable_shared_from_this.hpp> | 11 | #include <boost/enable_shared_from_this.hpp> |
| 12 | #include <boost/scoped_ptr.hpp> | ||
| 13 | #include <boost/thread/mutex.hpp> | ||
| 12 | 14 | ||
| 13 | #include <Swiften/Base/API.h> | 15 | #include <Swiften/Base/API.h> |
| 14 | #include <Swiften/EventLoop/EventOwner.h> | 16 | #include <Swiften/EventLoop/EventOwner.h> |
| 15 | #include <Swiften/Network/Timer.h> | 17 | #include <Swiften/Network/Timer.h> |
| 16 | 18 | ||
| @@ -19,10 +21,12 @@ namespace Swift { | |||
| 19 | 21 | ||
| 20 | class SWIFTEN_API BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> { | 22 | class SWIFTEN_API BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> { |
| 21 | public: | 23 | public: |
| 22 | typedef boost::shared_ptr<BoostTimer> ref; | 24 | typedef boost::shared_ptr<BoostTimer> ref; |
| 23 | 25 | ||
| 26 | virtual ~BoostTimer(); | ||
| 27 | |||
| 24 | static ref create(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) { | 28 | static ref create(int milliseconds, boost::shared_ptr<boost::asio::io_service> service, EventLoop* eventLoop) { |
| 25 | return ref(new BoostTimer(milliseconds, service, eventLoop)); | 29 | return ref(new BoostTimer(milliseconds, service, eventLoop)); |
| 26 | } | 30 | } |
| 27 | 31 | ||
| 28 | virtual void start(); | 32 | virtual void start(); |
| @@ -34,9 +38,10 @@ namespace Swift { | |||
| 34 | void handleTimerTick(const boost::system::error_code& error); | 38 | void handleTimerTick(const boost::system::error_code& error); |
| 35 | 39 | ||
| 36 | private: | 40 | private: |
| 37 | int timeout; | 41 | int timeout; |
| 38 | boost::shared_ptr<boost::asio::io_service> ioService; | 42 | boost::shared_ptr<boost::asio::io_service> ioService; |
| 39 | boost::asio::deadline_timer timer; | 43 | boost::scoped_ptr<boost::asio::deadline_timer> timer; |
| 44 | boost::mutex timerMutex; | ||
| 40 | EventLoop* eventLoop; | 45 | EventLoop* eventLoop; |
| 41 | }; | 46 | }; |
| 42 | } | 47 | } |