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())
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()) {
simgrid::s4u::Actor* restart();
smx_activity_t suspend(ActorImpl* issuer);
void resume();
+ smx_activity_t join(smx_actor_t actor, double timeout);
smx_activity_t sleep(double duration);
void set_user_data(void* data) { userdata_ = data; }
void* get_user_data() { return userdata_; }
extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor);
XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_activity_t synchro);
-XBT_PRIVATE smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout);
#endif