Fix promise not completed

Author: BewareMyPower

src/utils.cc

@@ -21,20 +21,17 @@
 
 void waitForAsyncResult(std::function<void(ResultCallback)> func) {
     auto promise = std::make_shared<std::promise<Result>>();
-    std::weak_ptr<std::promise<Result>> weakPromise{promise};
+    func([promise](Result result) { promise->set_value(result); });
+    internal::waitForResult(*promise);
+}
 
-    func([weakPromise](Result result) {
-        auto promise = weakPromise.lock();
-        if (promise) {
-            promise->set_value(result);
-        }
-    });
+namespace internal {
 
-    auto future = promise->get_future();
+void waitForResult(std::promise<pulsar::Result>& promise) {
+    auto future = promise.get_future();
     while (true) {
         {
             py::gil_scoped_release release;
-
             auto status = future.wait_for(std::chrono::milliseconds(100));
             if (status == std::future_status::ready) {
                 CHECK_RESULT(future.get());
@@ -47,3 +44,5 @@ void waitForAsyncResult(std::function<void(ResultCallback)> func) {
         }
     }
 }
+
+}  // namespace internal

src/utils.h

@@ -36,42 +36,26 @@ inline void CHECK_RESULT(Result res) {
     }
 }
 
+namespace internal {
+
+void waitForResult(std::promise<pulsar::Result>& promise);
+
+}  // namespace internal
+
 void waitForAsyncResult(std::function<void(ResultCallback)> func);
 
 template <typename T>
 inline T waitForAsyncValue(std::function<void(std::function<void(Result, const T&)>)> func) {
     auto resultPromise = std::make_shared<std::promise<Result>>();
     auto valuePromise = std::make_shared<std::promise<T>>();
 
-    std::weak_ptr<std::promise<Result>> weakResultPromise{resultPromise};
-    std::weak_ptr<std::promise<T>> weakValuePromise{valuePromise};
-
-    func([weakResultPromise, weakValuePromise](Result result, const T& value) {
-        auto valuePromise = weakValuePromise.lock();
-        if (valuePromise) {
-            valuePromise->set_value(value);
-        }
-        auto resultPromise = weakResultPromise.lock();
-        if (resultPromise) {
-            resultPromise->set_value(result);
-        }
+    func([resultPromise, valuePromise](Result result, const T& value) {
+        valuePromise->set_value(value);
+        resultPromise->set_value(result);
     });
 
-    auto resultFuture = resultPromise->get_future();
-    while (true) {
-        {
-            py::gil_scoped_release release;
-            auto status = resultFuture.wait_for(std::chrono::milliseconds(100));
-            if (status == std::future_status::ready) {
-                CHECK_RESULT(resultFuture.get());
-                return valuePromise->get_future().get();
-            }
-        }
-        py::gil_scoped_acquire acquire;
-        if (PyErr_CheckSignals() != 0) {
-            raiseException(ResultInterrupted);
-        }
-    }
+    internal::waitForResult(*resultPromise);
+    return valuePromise->get_future().get();
 }
 
 struct CryptoKeyReaderWrapper {