X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9856e530871afa8c75fda68ab7cbc718e9ba7e95..d236809e6149a03ef3e53599458f51c98f79f94d:/src/s4u/s4u_Activity.cpp diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index eee17e8d1a..aed5f01b28 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -83,8 +83,7 @@ bool Activity::test() kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); kernel::actor::ActivityTestSimcall observer{issuer, pimpl_.get()}; - if (kernel::actor::simcall_blocking([&observer] { observer.get_activity()->test(observer.get_issuer()); }, - &observer)) { + if (kernel::actor::simcall([&observer] { return observer.get_activity()->test(observer.get_issuer()); }, &observer)) { complete(State::FINISHED); return true; } @@ -99,8 +98,10 @@ ssize_t Activity::test_any(const std::vector& activities) kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); kernel::actor::ActivityTestanySimcall observer{issuer, ractivities}; - ssize_t changed_pos = kernel::actor::simcall_blocking( - [&observer] { kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); }, + ssize_t changed_pos = kernel::actor::simcall( + [&observer] { + return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); + }, &observer); if (changed_pos != -1) activities.at(changed_pos)->complete(State::FINISHED);