summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-11-18 13:51:58 (GMT)
committerSwift Review <review@swift.im>2015-11-19 15:32:04 (GMT)
commitfcf6a898de9c4f89db5de686aa203b3a52c18029 (patch)
tree4df426d92600eba8d4d60a88faaff1d5839129b0 /Swiften/EventLoop/Cocoa/CocoaEventLoop.h
parentcda6fd478b3d8f7f30f771b18324db389a01b1b3 (diff)
downloadswift-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/Cocoa/CocoaEventLoop.h')
-rw-r--r--Swiften/EventLoop/Cocoa/CocoaEventLoop.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/Swiften/EventLoop/Cocoa/CocoaEventLoop.h b/Swiften/EventLoop/Cocoa/CocoaEventLoop.h
index ee33fbb..aad6b0a 100644
--- a/Swiften/EventLoop/Cocoa/CocoaEventLoop.h
+++ b/Swiften/EventLoop/Cocoa/CocoaEventLoop.h
@@ -1,20 +1,28 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <boost/thread.hpp>
+
#include <Swiften/EventLoop/EventLoop.h>
namespace Swift {
class CocoaEventLoop : public EventLoop {
public:
CocoaEventLoop();
+ virtual ~CocoaEventLoop();
- virtual void post(const Event& event);
+ void handleNextCocoaEvent();
+
+ protected:
+ virtual void eventPosted();
- using EventLoop::handleEvent;
+ private:
+ bool isEventInCocoaEventLoop_;
+ boost::recursive_mutex isEventInCocoaEventLoopMutex_;
};
}