* This is very similar to simcall() right above, but the calling actor will not get rescheduled until
* actor->simcall_answer() is called explicitely.
*
+ * Since the return value does not come from the lambda directly, its type cannot be guessed automatically and must
+ * be provided as template parameter.
+ *
* This is meant for blocking actions. For example, locking a mutex is a blocking simcall.
* First it's a simcall because that's obviously a modification of the world. Then, that's a blocking simcall because if
* the mutex happens not to be free, the actor is added to a queue of actors in the mutex. Every mutex->unlock() takes
*
* If your code never calls actor->simcall_answer() itself, the actor will never return from its simcall.
*/
-template <class F> typename std::result_of<F()>::type simcall_blocking(F&& code, mc::SimcallInspector* t = nullptr)
+template <class R, class F> R simcall_blocking(F&& code, mc::SimcallInspector* t = nullptr)
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall mashalling/unmarshalling/dispatch:
// If we are in the application, pass the code to the maestro which
// executes it for us and reports the result. We use a std::future which
// conveniently handles the success/failure value for us.
- typedef typename std::result_of<F()>::type R;
simgrid::xbt::Result<R> result;
simcall_run_blocking([&result, &code] { simgrid::xbt::fulfill_promise(result, std::forward<F>(code)); }, t);
return result.get();
{
auto issuer = SIMIX_process_self();
auto target = pimpl_;
- kernel::actor::simcall_blocking([issuer, target, timeout] {
+ kernel::actor::simcall_blocking<void>([issuer, target, timeout] {
if (target->finished_) {
// The joined process is already finished, just wake up the issuer right away
issuer->simcall_answer();
auto issuer = SIMIX_process_self();
auto target = pimpl_;
s4u::Actor::on_suspend(*this);
- kernel::actor::simcall_blocking([issuer, target]() {
+ kernel::actor::simcall_blocking<void>([issuer, target]() {
target->suspend(issuer);
if (target != issuer) {
/* If we are suspending ourselves, then just do not finish the simcall now */
kernel::actor::ActorImpl* issuer = SIMIX_process_self();
Actor::on_sleep(*issuer->ciface());
- kernel::actor::simcall_blocking([issuer, duration]() {
+ kernel::actor::simcall_blocking<void>([issuer, duration]() {
if (MC_is_active() || MC_record_replay_is_active()) {
MC_process_clock_add(issuer, duration);
issuer->simcall_answer();