-/* Copyright (c) 2016-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2016-2019. 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. */
* 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())
try {
auto future = code();
future.then_([&result, self](std::shared_ptr<simgrid::kernel::FutureState<T>>&& value) {
- simgrid::xbt::setPromise(result, simgrid::kernel::Future<T>(value));
+ simgrid::xbt::set_promise(result, simgrid::kernel::Future<T>(value));
simgrid::simix::unblock(self);
});
}
});
return result.get();
}
+template <class F>
+XBT_ATTRIB_DEPRECATED_v323("Please use simix::kernel_sync()") auto kernelSync(F code) -> decltype(code().get())
+{
+ return kernel_sync(code);
+}
/** A blocking (`wait()`-based) future for SIMIX processes */
// TODO, .wait_for()
// 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::setPromise(result, simgrid::kernel::Future<T>(value));
+ simgrid::xbt::set_promise(result, simgrid::kernel::Future<T>(value));
simgrid::simix::unblock(self);
});
}
* @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::simix::simcall(std::move(code));
// Wrap the kernel future in a actor future:
return simgrid::simix::Future<T>(std::move(future));
}
-
+template <class F>
+XBT_ATTRIB_DEPRECATED_v323("Please use simix::kernel_sync()") auto kernelAsync(F code) -> Future<decltype(code().get())>
+{
+ return kernel_async(code);
+}
}
}