-/* Copyright (c) 2016. 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. */
#include <simgrid/simix.h>
#include <simgrid/simix.hpp>
-XBT_PUBLIC(void) simcall_run_blocking(std::function<void()> const& code);
-
namespace simgrid {
namespace simix {
-XBT_PUBLIC(void) unblock(smx_process_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.
* returns a `simgrid::kernel::Future<T>`. 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.
*
* @return Value of the kernel future
* @exception Exception from the kernel future
*/
-template<class F>
-auto kernelSync(F code) -> decltype(code().get())
+template <class F> auto kernel_sync(F code) -> decltype(code().get())
{
typedef decltype(code().get()) T;
if (SIMIX_is_maestro())
xbt_die("Can't execute blocking call in kernel mode");
- smx_process_t self = SIMIX_process_self();
+ smx_actor_t self = SIMIX_process_self();
simgrid::xbt::Result<T> result;
- simcall_run_blocking([&result, self, &code]{
- try {
- auto future = code();
- future.then_([&result, self](simgrid::kernel::Future<T> 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<simgrid::kernel::FutureState<T>>&& value) {
+ simgrid::xbt::set_promise(result, simgrid::kernel::Future<T>(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 T>
class Future {
public:
- Future() {}
- Future(simgrid::kernel::Future<T> future) : future_(std::move(future)) {}
+ Future() { /* Nothing to do*/}
+ explicit Future(simgrid::kernel::Future<T> future) : future_(std::move(future)) {}
bool valid() const { return future_.valid(); }
T get()
{
- if (!valid())
+ if (not valid())
throw std::future_error(std::future_errc::no_state);
- smx_process_t self = SIMIX_process_self();
+ smx_actor_t self = SIMIX_process_self();
simgrid::xbt::Result<T> result;
- simcall_run_blocking([this, &result, self]{
- try {
- // When the kernel future is ready...
- 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);
- });
- }
- 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<simgrid::kernel::FutureState<T>>&& value) {
+ // ... wake up the process with the result of the kernel future.
+ simgrid::xbt::set_promise(result, simgrid::kernel::Future<T>(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
{
- if (!valid())
+ if (not valid())
throw std::future_error(std::future_errc::no_state);
return future_.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);
- }
- });
+ 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](std::shared_ptr<simgrid::kernel::FutureState<T>>&& value) {
+ // ...store it the simix kernel and wake up.
+ this->future_ = simgrid::kernel::Future<T>(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<T> future_;
* @param code SimGrid kernel code which returns a simgrid::kernel::Future
* @return Actor future
*/
-template<class F>
-auto kernelAsync(F code)
- -> Future<decltype(code().get())>
+template <class F> auto kernel_async(F code) -> Future<decltype(code().get())>
{
typedef decltype(code().get()) T;
// Execute the code in the kernel and get the kernel future:
- simgrid::kernel::Future<T> future =
- simgrid::simix::kernelImmediate(std::move(code));
+ simgrid::kernel::Future<T> future = simgrid::kernel::actor::simcall(std::move(code));
// Wrap the kernel future in a actor future:
return simgrid::simix::Future<T>(std::move(future));
}
-
}
}
