-/* Copyright (c) 2016-2018. The SimGrid Team.
+/* Copyright (c) 2016-2019. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
xbt_assert(this->value_);
auto result = std::move(this->value_.get());
this->value_ = boost::optional<T>();
- return std::move(result);
+ return result;
}
private:
}
};
-template<class T>
-void bindPromise(Promise<T> promise, Future<T> future)
+template <class T> void bind_promise(Promise<T>&& promise, Future<T> future)
{
class PromiseBinder {
public:
- explicit PromiseBinder(Promise<T> promise) : promise_(std::move(promise)) {}
- void operator()(Future<T> future)
- {
- simgrid::xbt::setPromise(promise_, future);
- }
+ explicit PromiseBinder(Promise<T>&& promise) : promise_(std::move(promise)) {}
+ void operator()(Future<T> future) { simgrid::xbt::set_promise(promise_, future); }
+
private:
Promise<T> promise_;
};
future.then_(PromiseBinder(std::move(promise)));
}
-template<class T> Future<T> unwrapFuture(Future<Future<T>> future);
+template <class T> Future<T> unwrap_future(Future<Future<T>> future);
/** Result of some (probably) asynchronous operation in the SimGrid kernel
*
public:
Future() = default;
explicit Future(std::shared_ptr<FutureState<T>> state) : state_(std::move(state)) {}
+ ~Future() = default;
// Move type:
Future(Future&) = delete;
*
* This version never does future unwrapping.
*/
- template<class F>
- auto thenNoUnwrap(F continuation)
- -> Future<decltype(continuation(std::move(*this)))>
+ template <class F> auto then_no_unwrap(F continuation) -> Future<decltype(continuation(std::move(*this)))>
{
typedef decltype(continuation(std::move(*this))) R;
if (state_ == nullptr)
[](Promise<R> promise, std::shared_ptr<FutureState<T>> state, F continuation) {
// ...set the new future value by running the continuation.
Future<T> future(std::move(state));
- simgrid::xbt::fulfillPromise(promise, [&] { return continuation(std::move(future)); });
+ simgrid::xbt::fulfill_promise(promise, [&continuation, &future] { return continuation(std::move(future)); });
},
std::move(promise), state, std::move(continuation)));
- return std::move(future);
+ return future;
}
/** Attach a continuation to this future
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));
+ return this->then_no_unwrap(std::move(continuation));
}
/** Attach a continuation to this future (future chaining) */
decltype(continuation(std::move(*this)))
>::type
{
- return unwrapFuture(this->thenNoUnwap(std::move(continuation)));
+ return unwrap_future(this->then_no_unwrap(std::move(continuation)));
}
/** Get the value from the future
std::shared_ptr<FutureState<T>> state_;
};
-template<class T>
-Future<T> unwrapFuture(Future<Future<T>> future)
+template <class T> Future<T> unwrap_future(Future<Future<T>> future)
{
Promise<T> promise;
Future<T> result = promise.get_future();
- bindPromise(std::move(promise), std::move(future));
- return std::move(result);
+ bind_promise(std::move(promise), std::move(future));
+ return result;
}
/** Producer side of a @ref simgrid::kernel::Future
* auto promise = std::make_shared<simgrid::kernel::Promise<T>>();
* auto future = promise->get_future();
*
- * SIMIX_timer_set(date, [promise] {
+ * simgrid::simix::Timer::set(date, [promise] {
* try {
* int value = compute_the_value();
* if (value < 0)