Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-11-18 13:51:58 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-11-19 15:32:04 (GMT) |
| commit | fcf6a898de9c4f89db5de686aa203b3a52c18029 (patch) | |
| tree | 4df426d92600eba8d4d60a88faaff1d5839129b0 /Swiften/EventLoop/SimpleEventLoop.cpp | |
| parent | cda6fd478b3d8f7f30f771b18324db389a01b1b3 (diff) | |
| download | swift-fcf6a898de9c4f89db5de686aa203b3a52c18029.zip swift-fcf6a898de9c4f89db5de686aa203b3a52c18029.tar.bz2 | |
Redesign event loops to be thread-safe and deterministic
The new event loop design has a single event queue that is
synchronized to protect against data races.
The removal of events in the queue by EventOwner is
deterministic.
Test-Information:
All unit and integration tests with TSAN and
cxxflags=-DBOOST_SP_USE_PTHREADS on Debian 8.2 pass without
reports.
Multiple Swiften/QA/ClientTest/ClientTest runs under
different CPU stress caused no TSAN reports on Debian 8.2.
Swift itself only causes TSAN reports related to Qt itself,
out of our control, and most likely false positives, i.e.
TSAN not detecting the synchronization method inside Qt
correctly.
Unit tests pass without errors and successfully connected
to Slimber on OS X 10.10.5.
Change-Id: Ia1ed32ac2e758c5b9f86e0dac21362818740881e
Diffstat (limited to 'Swiften/EventLoop/SimpleEventLoop.cpp')
| -rw-r--r-- | Swiften/EventLoop/SimpleEventLoop.cpp | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/Swiften/EventLoop/SimpleEventLoop.cpp b/Swiften/EventLoop/SimpleEventLoop.cpp index 09b84dc..0bc06c9 100644 --- a/Swiften/EventLoop/SimpleEventLoop.cpp +++ b/Swiften/EventLoop/SimpleEventLoop.cpp @@ -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. */ @@ -7,35 +7,28 @@ #include <Swiften/EventLoop/SimpleEventLoop.h> #include <boost/bind.hpp> -#include <iostream> #include <Swiften/Base/foreach.h> - namespace Swift { -SimpleEventLoop::SimpleEventLoop() : isRunning_(true) { +SimpleEventLoop::SimpleEventLoop() : isRunning_(true), eventAvailable_(false) { } SimpleEventLoop::~SimpleEventLoop() { - if (!events_.empty()) { - std::cerr << "Warning: Pending events in SimpleEventLoop at destruction time" << std::endl; - } } void SimpleEventLoop::doRun(bool breakAfterEvents) { while (isRunning_) { - std::vector<Event> events; { - boost::unique_lock<boost::mutex> lock(eventsMutex_); - while (events_.empty()) { - eventsAvailable_.wait(lock); + boost::unique_lock<boost::mutex> lock(eventAvailableMutex_); + while (!eventAvailable_) { + eventAvailableCondition_.wait(lock); } - events.swap(events_); - } - foreach(const Event& event, events) { - handleEvent(event); + + eventAvailable_ = false; } + runOnce(); if (breakAfterEvents) { return; } @@ -43,14 +36,7 @@ void SimpleEventLoop::doRun(bool breakAfterEvents) { } void SimpleEventLoop::runOnce() { - std::vector<Event> events; - { - boost::unique_lock<boost::mutex> lock(eventsMutex_); - events.swap(events_); - } - foreach(const Event& event, events) { - handleEvent(event); - } + handleNextEvent(); } void SimpleEventLoop::stop() { @@ -61,12 +47,12 @@ void SimpleEventLoop::doStop() { isRunning_ = false; } -void SimpleEventLoop::post(const Event& event) { +void SimpleEventLoop::eventPosted() { { - boost::lock_guard<boost::mutex> lock(eventsMutex_); - events_.push_back(event); + boost::unique_lock<boost::mutex> lock(eventAvailableMutex_); + eventAvailable_ = true; } - eventsAvailable_.notify_one(); + eventAvailableCondition_.notify_one(); } |