From 0f0d5d8f8d4c0b1d325822406cb1a94fff3bf105 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 28 Nov 2016 09:17:12 +0000 Subject: [ThreadPool] Rollback recent changes until I figure out the breakage. llvm-svn: 288018 --- llvm/lib/Support/ThreadPool.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Support/ThreadPool.cpp') diff --git a/llvm/lib/Support/ThreadPool.cpp b/llvm/lib/Support/ThreadPool.cpp index 022f32a1378..db03a4d6240 100644 --- a/llvm/lib/Support/ThreadPool.cpp +++ b/llvm/lib/Support/ThreadPool.cpp @@ -82,7 +82,7 @@ void ThreadPool::wait() { [&] { return !ActiveThreads && Tasks.empty(); }); } -void ThreadPool::asyncImpl(TaskTy Task) { +std::shared_future ThreadPool::asyncImpl(TaskTy Task) { /// Wrap the Task in a packaged_task to return a future object. PackagedTaskTy PackagedTask(std::move(Task)); auto Future = PackagedTask.get_future(); @@ -96,6 +96,7 @@ void ThreadPool::asyncImpl(TaskTy Task) { Tasks.push(std::move(PackagedTask)); } QueueCondition.notify_one(); + return Future.share(); } // The destructor joins all threads, waiting for completion. @@ -135,7 +136,7 @@ void ThreadPool::wait() { } } -void ThreadPool::asyncImpl(TaskTy Task) { +std::shared_future ThreadPool::asyncImpl(TaskTy Task) { #ifndef _MSC_VER // Get a Future with launch::deferred execution using std::async auto Future = std::async(std::launch::deferred, std::move(Task)).share(); @@ -147,6 +148,7 @@ void ThreadPool::asyncImpl(TaskTy Task) { PackagedTaskTy PackagedTask([Future](bool) -> bool { Future.get(); return false; }); #endif Tasks.push(std::move(PackagedTask)); + return Future; } ThreadPool::~ThreadPool() { -- cgit v1.2.3