-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2016-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#ifndef SIMGRID_KERNEL_FUTURE_HPP
#define SIMGRID_KERNEL_FUTURE_HPP
+#include <functional>
#include <future>
+#include <memory>
+#include <utility>
#include <type_traits>
#include <boost/optional.hpp>
#include <xbt/base.h>
#include <xbt/functional.hpp>
-
-#include <functional>
-#include <future>
-#include <memory>
-#include <utility>
-#include <type_traits>
+#include <xbt/future.hpp>
namespace simgrid {
namespace kernel {
};
template<class T>
-struct is_future : public std::integral_constant<bool, false> {};
+struct is_future : std::false_type {};
template<class T>
-struct is_future<Future<T>> : public std::integral_constant<bool, true> {};
+struct is_future<Future<T>> : std::true_type {};
/** Bases stuff for all @ref simgrid::kernel::FutureState<T> */
class FutureStateBase {
FutureStateBase(FutureStateBase const&) = delete;
FutureStateBase& operator=(FutureStateBase const&) = delete;
+ XBT_PUBLIC void schedule(simgrid::xbt::Task<void()>&& job);
+
void set_exception(std::exception_ptr exception)
{
xbt_assert(exception_ == nullptr);
this->set_ready();
}
- void set_continuation(simgrid::xbt::Task<void()> continuation)
+ void set_continuation(simgrid::xbt::Task<void()>&& continuation)
{
- xbt_assert(!continuation_);
+ xbt_assert(not continuation_);
switch (status_) {
case FutureStatus::done:
// This is not supposed to happen if continuation is set
case FutureStatus::ready:
// The future is ready, execute the continuation directly.
// We might execute it from the event loop instead:
- continuation();
+ schedule(std::move(continuation));
break;
case FutureStatus::not_ready:
// The future is not ready so we mast keep the continuation for
// We need to do this becase the current implementation of the
// continuation has a shared_ptr to the FutureState.
auto continuation = std::move(continuation_);
- continuation();
+ this->schedule(std::move(continuation));
}
}
status_ = FutureStatus::done;
if (exception_) {
std::exception_ptr exception = std::move(exception_);
+ exception_ = nullptr;
std::rethrow_exception(std::move(exception));
}
}
xbt_assert(this->value_);
T* result = value_;
value_ = nullptr;
- return *value_;
+ return *result;
}
private:
template<class T>
void bindPromise(Promise<T> promise, Future<T> future)
{
- struct PromiseBinder {
+ class PromiseBinder {
public:
- PromiseBinder(Promise<T> promise) : promise_(std::move(promise)) {}
+ explicit PromiseBinder(Promise<T> promise) : promise_(std::move(promise)) {}
void operator()(Future<T> future)
{
simgrid::xbt::setPromise(promise_, future);
class Future {
public:
Future() = default;
- Future(std::shared_ptr<FutureState<T>> state): state_(std::move(state)) {}
+ explicit Future(std::shared_ptr<FutureState<T>> state) : state_(std::move(state)) {}
// Move type:
Future(Future&) = delete;
* the future is ready
* @exception std::future_error no state is associated with the future
*/
- template<class F>
- auto then(F continuation)
- -> typename std::enable_if<
- !is_future<decltype(continuation(std::move(*this)))>::value,
- Future<decltype(continuation(std::move(*this)))>
- >::type
+ template <class F>
+ auto then(F continuation) -> typename std::enable_if<not is_future<decltype(continuation(std::move(*this)))>::value,
+ Future<decltype(continuation(std::move(*this)))>>::type
{
return this->thenNoUnwrap(std::move(continuation));
}
}
/** Get the value from the future
- *
- * This is expected to be called
*
* The future must be valid and ready in order to make this call.
* @ref std::future blocks when the future is not ready but we are
return std::move(result);
}
-/** Producer side of a @simgrid::kernel::Future
+/** Producer side of a @ref simgrid::kernel::Future
*
* A @ref Promise is connected to some `Future` and can be used to
* set its result.
class Promise {
public:
Promise() : state_(std::make_shared<FutureState<T>>()) {}
- Promise(std::shared_ptr<FutureState<T>> state) : state_(std::move(state)) {}
+ explicit Promise(std::shared_ptr<FutureState<T>> state) : state_(std::move(state)) {}
// Move type
Promise(Promise const&) = delete;
class Promise<void> {
public:
Promise() : state_(std::make_shared<FutureState<void>>()) {}
- Promise(std::shared_ptr<FutureState<void>> state) : state_(std::move(state)) {}
+ explicit Promise(std::shared_ptr<FutureState<void>> state) : state_(std::move(state)) {}
~Promise()
{
if (state_ && state_->get_status() == FutureStatus::not_ready)