1 files changed, 27 insertions, 43 deletions
diff --git a/Swiften/EventLoop/SimpleEventLoop.cpp b/Swiften/EventLoop/SimpleEventLoop.cpp
index 42a5481..745fadb 100644
--- a/Swiften/EventLoop/SimpleEventLoop.cpp
+++ b/Swiften/EventLoop/SimpleEventLoop.cpp
@@ -1,72 +1,56 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2019 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #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);
-			}
-			events.swap(events_);
-		}
-		foreach(const Event& event, events) {
-			handleEvent(event);
-		}
-		if (breakAfterEvents) {
-			return;
-		}
-	}
+    while (isRunning_) {
+        {
+            std::unique_lock<std::mutex> lock(eventAvailableMutex_);
+            while (!eventAvailable_) {
+                eventAvailableCondition_.wait(lock);
+            }
+
+            eventAvailable_ = false;
+        }
+        runOnce();
+        if (breakAfterEvents) {
+            return;
+        }
+    }
 }
 
 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() {
-	postEvent(boost::bind(&SimpleEventLoop::doStop, this));
+    postEvent(boost::bind(&SimpleEventLoop::doStop, this));
 }
 
 void SimpleEventLoop::doStop() {
-	isRunning_ = false;
+    isRunning_ = false;
 }
 
-void SimpleEventLoop::post(const Event& event) {
-	{
-		boost::lock_guard<boost::mutex> lock(eventsMutex_);
-		events_.push_back(event);
-	}
-	eventsAvailable_.notify_one();
+void SimpleEventLoop::eventPosted() {
+    {
+        std::unique_lock<std::mutex> lock(eventAvailableMutex_);
+        eventAvailable_ = true;
+    }
+    eventAvailableCondition_.notify_one();
 }