Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / simgrid / simix / blocking_simcall.hpp

diff --git a/include/simgrid/simix/blocking_simcall.hpp b/include/simgrid/simix/blocking_simcall.hpp
index ee12510..7fa0b25 100644 (file)
--- a/include/simgrid/simix/blocking_simcall.hpp
+++ b/include/simgrid/simix/blocking_simcall.hpp
@@ -7,14 +7,13 @@
 #ifndef SIMGRID_SIMIX_BLOCKING_SIMCALL_HPP
 #define SIMGRID_SIMIX_BLOCKING_SIMCALL_HPP
 
-#include <iostream>
-
 #include <exception>
+#include <functional>
+#include <future>
+#include <utility>
 
 #include <xbt/sysdep.h>
 
-#include <future>
-
 #include <xbt/future.hpp>
 #include <simgrid/kernel/future.hpp>
 #include <simgrid/simix.h>
@@ -57,7 +56,7 @@ auto kernelSync(F code) -> decltype(code().get())
   simcall_run_blocking([&result, self, &code]{
     try {
       auto future = code();
-      future.then([&result, self](simgrid::kernel::Future<T> value) {
+      future.then_([&result, self](simgrid::kernel::Future<T> value) {
         simgrid::xbt::setPromise(result, value);
         simgrid::simix::unblock(self);
       });
@@ -71,6 +70,11 @@ auto kernelSync(F code) -> decltype(code().get())
 }
 
 /** A blocking (`wait()`-based) future for SIMIX processes */
+// TODO, .wait_for()
+// TODO, .wait_until()
+// TODO, SharedFuture
+// TODO, simgrid::simix::when_all - wait for all future to be ready (this one is simple!)
+// TODO, simgrid::simix::when_any - wait for any future to be ready
 template <class T>
 class Future {
 public:
@@ -87,7 +91,7 @@ public:
     simcall_run_blocking([this, &result, self]{
       try {
         // When the kernel future is ready...
-        this->future_.then([this, &result, self](simgrid::kernel::Future<T> value) {
+        this->future_.then_([this, &result, self](simgrid::kernel::Future<T> value) {
           // ... wake up the process with the result of the kernel future.
           simgrid::xbt::setPromise(result, value);
           simgrid::simix::unblock(self);
@@ -100,9 +104,35 @@ public:
     });
     return result.get();
   }
-  // TODO, wait()
-  // TODO, wait_for()
-  // TODO, wait_until()
+  bool is_ready() const
+  {
+    if (!valid())
+      throw std::future_error(std::future_errc::no_state);
+    return future_.is_ready();
+  }
+  void wait()
+  {
+    // The future is ready! We don't have to wait:
+    if (this->is_ready())
+      return;
+    // The future is not ready. We have to delegate to the SimGrid kernel:
+    std::exception_ptr exception;
+    smx_process_t self = SIMIX_process_self();
+    simcall_run_blocking([this, &exception, self]{
+      try {
+        // When the kernel future is ready...
+        this->future_.then_([this, self](simgrid::kernel::Future<T> value) {
+          // ...store it the simix kernel and wake up.
+          this->future_ = std::move(value);
+          simgrid::simix::unblock(self);
+        });
+      }
+      catch (...) {
+        exception = std::current_exception();
+        simgrid::simix::unblock(self);
+      }
+    });
+  }
 private:
   // We wrap an event-based kernel future:
   simgrid::kernel::Future<T> future_;