arangodb
diff --git a/‎CHANGELOG‎
Lines changed: 2 additions & 0 deletions b/‎CHANGELOG‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎arangod/Aql/ModificationExecutorHelpers.cpp‎
Lines changed: 7 additions & 6 deletions b/‎arangod/Aql/ModificationExecutorHelpers.cpp‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎lib/Futures/include/Futures/Future.h‎
Lines changed: 10 additions & 2 deletions b/‎lib/Futures/include/Futures/Future.h‎
Lines changed: 10 additions & 2 deletions
@@ -1,6 +1,8 @@
 v3.11.14 (XXXX-XX-XX)
 ---------------------
 
+* Optimise wait and detach in futures
+
 * Updated ArangoDB Starter to v0.18.15.
 
 * Updated arangosync to v2.19.15.
 
@@ -247,14 +247,15 @@ AqlValue ModificationExecutorHelpers::getDocumentOrNull(
 // while to avoid delays:
 void ModificationExecutorHelpers::waitAndDetach(
     futures::Future<OperationResult>& future) {
+
   if (!future.isReady()) {
     {
-      auto const spinTime = std::chrono::milliseconds(10);
-      auto const start = std::chrono::steady_clock::now();
-      while (!future.isReady() &&
-             std::chrono::steady_clock::now() - start < spinTime) {
-        basics::cpu_relax();
-      }
+      using namespace std::literals::chrono_literals;
+      auto const end = std::chrono::steady_clock::now() + 100ms;
+      auto const cb  = [&]() noexcept {
+        return end - std::chrono::steady_clock::now();
+      };
+      future.wait(cb);
     }
     if (!future.isReady()) {
       auto const detachTime = std::chrono::milliseconds(
 
@@ -27,6 +27,7 @@
 #include <condition_variable>
 #include <mutex>
 #include <thread>
+#include <functional>
 
 #include "Futures/Exceptions.h"
 #include "Futures/Promise.h"
@@ -132,7 +133,7 @@ struct EmptyConstructor {};
 
 // uses a condition_variable to wait
 template<typename T>
-void waitImpl(Future<T>& f) {
+void waitImpl(Future<T>& f, std::function<std::chrono::steady_clock::duration const ()> cb = nullptr) {
     return;  // short-circuit
   }
@@ -153,7 +154,13 @@ void waitImpl(Future<T>& f) {
     cv.notify_one();
   });
   std::unique_lock<std::mutex> lock(m);
-  cv.wait(lock, [&ret] { return ret.isReady(); });
+
+  if (cb != nullptr) {
+    while (cv.wait_for(lock, cb(), [&ret] { return ret.isReady(); })) {}
+  } else {
+    cv.wait(lock, [&ret] { return ret.isReady(); });
+  }
+  
   f = std::move(ret);
 }
 
@@ -270,6 +277,7 @@ class Future {
   Try<T> const&& result() const&& { return std::move(getStateTryChecked()); }
 
   /// Blocks until this Future is complete.
+  void wait(std::function<std::chrono::steady_clock::duration const () > cb) { detail::waitImpl(*this, cb); }
   void wait() { detail::waitImpl(*this); }
 
   /// When this Future has completed, execute func which is a function that