From 9493d4764b4b4d3400b0ecfca96add85a4adc320 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Thu, 14 Jan 2016 15:52:49 +0100
Subject: [PATCH] mapReduce/runAsync: Fix behavior of waitForFinished

When a QFutureInterface is constructed, it is in "NoState",
but waitForFinished only blocks if it is in "Running" state.
So we need to reportStarted actually before the thread is started
(so we report it before leaving the mapReduce/runAsync method)

Change-Id: I1cdf0d627c5a6c26797b04fd0d331cddb01d50af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/libs/utils/runextensions.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/utils/runextensions.h b/src/libs/utils/runextensions.h
index 82854abd731..af174a32e26 100644
--- a/src/libs/utils/runextensions.h
+++ b/src/libs/utils/runextensions.h
@@ -512,7 +512,6 @@ void blockingMapReduce(QFutureInterface<ReduceResult> futureInterface, const Con
                        const ReduceFunction &reduce, const CleanUpFunction &cleanup)
 {
     auto state = init(futureInterface);
-    futureInterface.reportStarted();
     mapReduceLoop(futureInterface, container, map, state, reduce);
     cleanup(futureInterface, state);
     if (futureInterface.isPaused())
@@ -523,7 +522,6 @@ void blockingMapReduce(QFutureInterface<ReduceResult> futureInterface, const Con
 template <typename ResultType, typename Function, typename... Args>
 void runAsyncImpl(QFutureInterface<ResultType> futureInterface, const Function &function, const Args&... args)
 {
-    futureInterface.reportStarted();
     function(futureInterface, args...);
     if (futureInterface.isPaused())
         futureInterface.waitForResume();
@@ -540,6 +538,7 @@ QFuture<ReduceResult> mapReduce(std::reference_wrapper<Container> containerWrapp
 {
     auto fi = QFutureInterface<ReduceResult>();
     QFuture<ReduceResult> future = fi.future();
+    fi.reportStarted();
     std::thread(Internal::blockingMapReduce<Container, InitFunction, MapFunction, ReduceResult, ReduceFunction, CleanUpFunction>,
                 fi, containerWrapper, init, map, reduce, cleanup).detach();
     return future;
@@ -561,6 +560,7 @@ template <typename ResultType, typename Function, typename... Args>
 QFuture<ResultType> runAsync(Function &&function, Args&&... args)
 {
     QFutureInterface<ResultType> futureInterface;
+    futureInterface.reportStarted();
     std::thread(Internal::runAsyncImpl<ResultType,Function,Args...>, futureInterface,
                 std::forward<Function>(function), std::forward<Args>(args)...).detach();
     return futureInterface.future();