add support for whenAll to waitWithSemaphore

Summary:
waitWithSemaphore currently doesn't support vector<Try<T>>, unless T is void.
Fix that, and also add a now-required void specialization.

Test Plan:
Add a test that uses vector<Try<bool>>, ensure that the tests compile
(and pass).

Reviewed By: hans@fb.com

Subscribers: folly@lists, fugalh

FB internal diff: D1338528

Tasks: 4389473

diff --git a/folly/wangle/Future-inl.h b/folly/wangle/Future-inl.h
index 940d869685a61ecc3c120c4c5e67449aa19cdc99..df5831db8905d77e67aa3174b110ec8379f6602b 100644 (file)
--- a/folly/wangle/Future-inl.h
+++ b/folly/wangle/Future-inl.h
@@ -420,18 +420,28 @@ whenN(InputIterator first, InputIterator last, size_t n) {
 }
 
 template <typename F>
-typename std::add_lvalue_reference<typename F::value_type>::type
+typename F::value_type
 waitWithSemaphore(F&& f) {
   LifoSem sem;
-  auto done = f.then([&](Try<typename F::value_type> &&t) {
+  Try<typename F::value_type> done;
+  f.then([&](Try<typename F::value_type> &&t) {
+    done = std::move(t);
     sem.post();
-    return t.value();
   });
   sem.wait();
-  while (!done.isReady()) {}
-  return done.value();
+  return std::move(done.value());
 }
 
+inline void waitWithSemaphore(Future<void>&& f) {
+  LifoSem sem;
+  Try<void> done;
+  f.then([&](Try<void> &&t) {
+    done = std::move(t);
+    sem.post();
+  });
+  sem.wait();
+  return done.value();
+}
 }}
 
 // I haven't included a Future<T&> specialization because I don't forsee us

diff --git a/folly/wangle/Future.h b/folly/wangle/Future.h
index 20ecce1699b2da5e5911a6f43537a543764e9f10..e7d0f415832c647a7e99aad9069dc704dd14fb05 100644 (file)
--- a/folly/wangle/Future.h
+++ b/folly/wangle/Future.h
@@ -320,7 +320,7 @@ whenN(InputIterator first, InputIterator last, size_t n);
  * you call this, it will deadlock.
  */
 template <class F>
-typename std::add_lvalue_reference<typename F::value_type>::type
+typename F::value_type
 waitWithSemaphore(F&& f);
 
 }} // folly::wangle

diff --git a/folly/wangle/test/FutureTest.cpp b/folly/wangle/test/FutureTest.cpp
index a7a2fa1c92cda0285053234ff82f5dae5ace4efa..84977c7437285ed9e4322d84392b478ee525545e 100644 (file)
--- a/folly/wangle/test/FutureTest.cpp
+++ b/folly/wangle/test/FutureTest.cpp
@@ -645,6 +645,13 @@ TEST(Future, waitWithSemaphoreImmediate) {
   v_f.push_back(makeFuture());
   auto done_v_f = waitWithSemaphore(whenAll(v_f.begin(), v_f.end()));
   EXPECT_EQ(2, done_v_f.size());
+
+  vector<Future<bool>> v_fb;
+  v_fb.push_back(makeFuture(true));
+  v_fb.push_back(makeFuture(false));
+  auto fut = whenAll(v_fb.begin(), v_fb.end());
+  auto done_v_fb = waitWithSemaphore(std::move(fut));
+  EXPECT_EQ(2, done_v_fb.size());
 }
 
 TEST(Future, waitWithSemaphore) {