-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2016-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
simcall_run_blocking([&result, self, &code]{
try {
auto future = code();
- future.then_([&result, self](simgrid::kernel::Future<T> value) {
- simgrid::xbt::setPromise(result, value);
+ future.then_([&result, self](std::shared_ptr<simgrid::kernel::FutureState<T>>&& value) {
+ simgrid::xbt::setPromise(result, simgrid::kernel::Future<T>(value));
simgrid::simix::unblock(self);
});
}
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_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) {
+ 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::setPromise(result, value);
+ simgrid::xbt::setPromise(result, simgrid::kernel::Future<T>(value));
simgrid::simix::unblock(self);
});
}
}
bool is_ready() const
{
- if (!valid())
+ if (not valid())
throw std::future_error(std::future_errc::no_state);
return future_.is_ready();
}
simcall_run_blocking([this, &exception, self]{
try {
// When the kernel future is ready...
- this->future_.then_([this, self](simgrid::kernel::Future<T> value) {
+ this->future_.then_([this, self](std::shared_ptr<simgrid::kernel::FutureState<T>>&& value) {
// ...store it the simix kernel and wake up.
- this->future_ = std::move(value);
+ this->future_ = std::move(simgrid::kernel::Future<T>(value));
simgrid::simix::unblock(self);
});
}