Merge lp:~knitzsche/scope-aggregator/bug_1489906_thread_safe_buffering into lp:scope-aggregator

[Kyle Nitzsche]

This implements thread safety in the buffering code by protecting certain ResultForwarder methods with mutex locks.

[Gary.Wang (gary-wzl77)]

Looks good to me.
Thanks.

review: Approve

[Penk Chen (penk)]

LGTM, top-approve that

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-19 17:53:41 +0000
+++ CMakeLists.txt	2015-08-28 15:29:00 +0000
@@ -1,4 +1,4 @@
-set(VERSION "1.5.25")
+set(VERSION "1.5.26")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )

=== modified file 'include/resultforwarder.h'
--- include/resultforwarder.h	2015-01-28 08:31:20 +0000
+++ include/resultforwarder.h	2015-08-28 15:29:00 +0000
@@ -28,6 +28,7 @@
 #include<memory>
 #include<cassert>
 #include <functional>
+#include <mutex>
 #include "notify-strategy.h"
 
 class ResultForwarder : public unity::scopes::SearchListenerBase {
@@ -52,6 +53,8 @@
     virtual void finished(unity::scopes::CompletionDetails const& details) override;
 
 protected:
+
+    std::mutex mutex_;
     void on_forwarder_ready(ResultForwarder *fw);
     virtual void on_all_forwarders_ready();
     unity::scopes::SearchReplyProxy upstream;

=== modified file 'src/resultforwarder.cpp'
--- src/resultforwarder.cpp	2015-05-22 18:55:44 +0000
+++ src/resultforwarder.cpp	2015-08-28 15:29:00 +0000
@@ -34,6 +34,7 @@
 }
 
 void ResultForwarder::push(CategorisedResult result) {
+    std::lock_guard<std::mutex> lock(mutex_);
     {
         if (result_filter(result))
         {
@@ -59,6 +60,7 @@
 }
 
 void ResultForwarder::finished(unity::scopes::CompletionDetails const& /*details*/) {
+    std::lock_guard<std::mutex> lock(mutex_);
     if (!ready_)
     {
         ready_ = true;