io->cancel();
} else {
simgrid::kernel::activity::ActivityImplPtr activity = waiting_synchro;
- xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(),
+ xbt_die("Activity %s is of unknown type %s", activity->get_cname(),
simgrid::xbt::demangle(typeid(activity).name()).get());
}
XBT_OUT();
}
+smx_activity_t ActorImpl::join(smx_actor_t actor, double timeout)
+{
+ smx_activity_t res = this->sleep(timeout);
+ intrusive_ptr_add_ref(res.get());
+ SIMIX_process_on_exit(actor,
+ [](int, void* arg) {
+ auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
+ if (sleep->surf_action_)
+ sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED);
+ intrusive_ptr_release(sleep);
+ },
+ res.get());
+ return res;
+}
smx_activity_t ActorImpl::sleep(double duration)
{
if (not host_->is_on())
throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
- XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there.")));
+ XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there.")));
return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_))
->start(duration);
SIMIX_simcall_answer(simcall);
return;
}
- smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
+ smx_activity_t sync = simcall->issuer->join(process, timeout);
sync->simcalls_.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
}
-smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout)
-{
- smx_activity_t res = issuer->sleep(timeout);
- intrusive_ptr_add_ref(res.get());
- SIMIX_process_on_exit(process,
- [](int, void* arg) {
- auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
- if (sleep->surf_action_)
- sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED);
- intrusive_ptr_release(sleep);
- },
- res.get());
- return res;
-}
-
void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
{
if (MC_is_active() || MC_record_replay_is_active()) {
{
XBT_DEBUG("Destroy sleep synchro %p", synchro.get());
simgrid::kernel::activity::SleepImplPtr sleep =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
+ boost::static_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
if (sleep->surf_action_) {
sleep->surf_action_->unref();
{
smx_actor_t self = SIMIX_process_self();
return simgrid::simix::simcall([name, code, data, host, properties, self] {
- return simgrid::kernel::actor::ActorImpl::create(name, std::move(code), data, host, properties, self).get();
+ return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(code), data, host, properties, self)
+ .get();
});
}