X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e4a69258bc6825a548dabc242d5caeaf82ac634..12459ed00fdc525ec6e524555dfe80ce7737bab7:/include/simgrid/simix/blocking_simcall.hpp diff --git a/include/simgrid/simix/blocking_simcall.hpp b/include/simgrid/simix/blocking_simcall.hpp index a856eca0ee..fd9797f9d8 100644 --- a/include/simgrid/simix/blocking_simcall.hpp +++ b/include/simgrid/simix/blocking_simcall.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2016-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -19,12 +18,10 @@ #include #include -XBT_PUBLIC(void) simcall_run_blocking(std::function const& code); - namespace simgrid { namespace simix { -XBT_PUBLIC(void) unblock(smx_actor_t process); +XBT_PUBLIC void unblock(smx_actor_t process); /** Execute some code in kernel mode and wakes up the actor when * the result is available. @@ -33,7 +30,7 @@ XBT_PUBLIC(void) unblock(smx_actor_t process); * returns a `simgrid::kernel::Future`. The kernel blocks the actor * until the Future is ready and: * - * - either returns the value wrapped in the future to the actor; + * - either returns the value wrapped in the future to the actor * * - or raises the exception stored in the future in the actor. * @@ -46,43 +43,45 @@ XBT_PUBLIC(void) unblock(smx_actor_t process); * @return Value of the kernel future * @exception Exception from the kernel future */ -template -auto kernelSync(F code) -> decltype(code().get()) +template auto kernel_sync(F code) -> decltype(code().get()) { - typedef decltype(code().get()) T; + using T = decltype(code().get()); if (SIMIX_is_maestro()) xbt_die("Can't execute blocking call in kernel mode"); smx_actor_t self = SIMIX_process_self(); simgrid::xbt::Result result; - simcall_run_blocking([&result, self, &code]{ - try { - auto future = code(); - future.then_([&result, self](simgrid::kernel::Future value) { - simgrid::xbt::setPromise(result, value); - simgrid::simix::unblock(self); - }); - } - catch (...) { - result.set_exception(std::current_exception()); - simgrid::simix::unblock(self); - } - }); + simcall_run_blocking( + [&result, self, &code] { + try { + auto future = code(); + future.then_([&result, self](std::shared_ptr> value) { + simgrid::xbt::set_promise(result, simgrid::kernel::Future(std::move(value))); + simgrid::simix::unblock(self); + }); + } catch (...) { + result.set_exception(std::current_exception()); + simgrid::simix::unblock(self); + } + }, + nullptr); return result.get(); } /** A blocking (`wait()`-based) future for SIMIX processes */ -// TODO, .wait_for() -// TODO, .wait_until() +// 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 Future { public: - Future() { /* Nothing to do*/} + Future() = default; explicit Future(simgrid::kernel::Future future) : future_(std::move(future)) {} + Future(Future&&) noexcept = default; + Future& operator=(Future&&) noexcept = default; bool valid() const { return future_.valid(); } T get() @@ -91,20 +90,21 @@ public: throw std::future_error(std::future_errc::no_state); smx_actor_t self = SIMIX_process_self(); simgrid::xbt::Result result; - simcall_run_blocking([this, &result, self]{ - try { - // When the kernel future is ready... - this->future_.then_([&result, self](simgrid::kernel::Future value) { - // ... wake up the process with the result of the kernel future. - simgrid::xbt::setPromise(result, value); - simgrid::simix::unblock(self); - }); - } - catch (...) { - result.set_exception(std::current_exception()); - simgrid::simix::unblock(self); - } - }); + simcall_run_blocking( + [this, &result, self] { + try { + // When the kernel future is ready... + this->future_.then_([&result, self](std::shared_ptr> value) { + // ... wake up the process with the result of the kernel future. + simgrid::xbt::set_promise(result, simgrid::kernel::Future(std::move(value))); + simgrid::simix::unblock(self); + }); + } catch (...) { + result.set_exception(std::current_exception()); + simgrid::simix::unblock(self); + } + }, + nullptr); return result.get(); } bool is_ready() const @@ -121,21 +121,23 @@ public: // The future is not ready. We have to delegate to the SimGrid kernel: std::exception_ptr exception; smx_actor_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 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); - } - }); + simcall_run_blocking( + [this, &exception, self] { + try { + // When the kernel future is ready... + this->future_.then_([this, self](std::shared_ptr> value) { + // ...store it the simix kernel and wake up. + this->future_ = simgrid::kernel::Future(std::move(value)); + simgrid::simix::unblock(self); + }); + } catch (...) { + exception = std::current_exception(); + simgrid::simix::unblock(self); + } + }, + nullptr); } + private: // We wrap an event-based kernel future: simgrid::kernel::Future future_; @@ -146,20 +148,16 @@ private: * @param code SimGrid kernel code which returns a simgrid::kernel::Future * @return Actor future */ -template -auto kernelAsync(F code) - -> Future +template auto kernel_async(F code) -> Future { - typedef decltype(code().get()) T; + using T = decltype(code().get()); // Execute the code in the kernel and get the kernel future: - simgrid::kernel::Future future = - simgrid::simix::kernelImmediate(std::move(code)); + simgrid::kernel::Future future = simgrid::kernel::actor::simcall(std::move(code)); - // Wrap the kernel future in a actor future: + // Wrap the kernel future in an actor future: return simgrid::simix::Future(std::move(future)); } - } }