return prng.uniform_int(min, max);
}
simgrid::kernel::actor::RandomSimcall observer{simgrid::kernel::actor::ActorImpl::self(), min, max};
- return simgrid::kernel::actor::simcall([&observer] { return observer.get_value(); }, &observer);
+ return simgrid::kernel::actor::simcall_answered([&observer] { return observer.get_value(); }, &observer);
}
namespace simgrid {
while (engine->has_actors_to_run()) {
engine->run_all_actors();
for (auto const& actor : engine->get_actors_that_ran()) {
- const s_smx_simcall* req = &actor->simcall_;
- if (req->call_ != simix::Simcall::NONE && not simgrid::mc::request_is_visible(req))
+ const kernel::actor::Simcall* req = &actor->simcall_;
+ if (req->call_ != kernel::actor::Simcall::Type::NONE && not simgrid::mc::request_is_visible(req))
actor->simcall_handle(0);
}
}
// Called from both MCer and MCed:
bool actor_is_enabled(smx_actor_t actor)
{
-// #del
#if SIMGRID_HAVE_MC
- // If in the MCer, ask the client app since it has all the data
- if (mc_model_checker != nullptr) {
- return simgrid::mc::session_singleton->actor_is_enabled(actor->get_pid());
- }
+ xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
#endif
-// #
// Now, we are in the client app, no need for remote memory reading.
- smx_simcall_t req = &actor->simcall_;
+ kernel::actor::Simcall* req = &actor->simcall_;
if (req->observer_ != nullptr)
return req->observer_->is_enabled();
- if (req->call_ == simix::Simcall::NONE)
+ if (req->call_ == kernel::actor::Simcall::Type::NONE)
return false;
else
/* The rest of the requests are always enabled */
/* This is the list of requests that are visible from the checker algorithm.
* Any other requests are handled right away on the application side.
*/
-bool request_is_visible(const s_smx_simcall* req)
+bool request_is_visible(const kernel::actor::Simcall* req)
{
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");