XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
process->waiting_synchro.get());
- process->finished_ = true;
- SIMIX_process_on_exit_runall(process);
-
- /* Unregister from the kill timer if any */
- if (process->kill_timer != nullptr) {
- SIMIX_timer_remove(process->kill_timer);
- process->kill_timer = nullptr;
- }
-
simix_global->mutex.lock();
- /* cancel non-blocking communications */
- while (not process->comms.empty()) {
- smx_activity_t synchro = process->comms.front();
- process->comms.pop_front();
- simgrid::kernel::activity::CommImplPtr comm =
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
-
- /* make sure no one will finish the comm after this process is destroyed,
- * because src_proc or dst_proc would be an invalid pointer */
-
- if (comm->src_proc == process) {
- XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
- comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc);
- comm->src_proc = nullptr;
-
- } else if (comm->dst_proc == process) {
- XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_,
- comm->src_proc, comm->dst_proc);
- comm->dst_proc = nullptr;
-
- if (comm->detached && comm->src_proc != nullptr) {
- /* the comm will be freed right now, remove it from the sender */
- comm->src_proc->comms.remove(comm);
- }
- } else {
- xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get());
- }
- comm->cancel();
- }
-
- XBT_DEBUG("%s@%s(%ld) should not run anymore", process->get_cname(), process->iface()->get_host()->get_cname(),
- process->pid_);
simix_global->process_list.erase(process->pid_);
if (process->host_ && process->host_process_list_hook.is_linked())
simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list_, *process);
}
namespace simgrid {
-
namespace kernel {
namespace actor {
delete this->context_;
}
+void ActorImpl::set_kill_time(double kill_time)
+{
+ if (kill_time <= SIMIX_get_clock())
+ return;
+ XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, get_cname(), host_->get_cname());
+ kill_timer = SIMIX_timer_set(kill_time, [this] {
+ SIMIX_process_kill(this, nullptr);
+ kill_timer = nullptr;
+ });
+}
+
static void dying_daemon(int /*exit_status*/, void* data)
{
std::vector<ActorImpl*>* vect = &simix_global->daemons;
// start the new process
ActorImpl* actor =
SIMIX_process_create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
- simcall_process_set_kill_time(actor, arg.kill_time);
+ actor->set_kill_time(arg.kill_time);
actor->set_auto_restart(arg.auto_restart);
return actor->ciface();
simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
synchro->host = host_;
- synchro->surf_sleep = host_->pimpl_cpu->sleep(duration);
- synchro->surf_sleep->set_data(synchro);
+ synchro->surf_action_ = host_->pimpl_cpu->sleep(duration);
+ synchro->surf_action_->set_data(synchro);
XBT_DEBUG("Create sleep synchronization %p", synchro);
return synchro;
// Forcefully kill the actor if its host is turned off. Not an HostFailureException because you should not survive that
if (actor->host_->is_off())
- actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("host failed")));
+ actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed")));
/* destroy the blocking synchro if any */
if (actor->waiting_synchro != nullptr) {
if (i != actor->waiting_synchro->simcalls_.end())
actor->waiting_synchro->simcalls_.remove(&actor->simcall);
} else if (sleep != nullptr) {
- if (sleep->surf_sleep)
- sleep->surf_sleep->cancel();
+ if (sleep->surf_action_)
+ sleep->surf_action_->cancel();
sleep->post();
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(actor, &actor->simcall);
SIMIX_process_on_exit(process,
[](int, void* arg) {
auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
- if (sleep->surf_sleep)
- sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
+ if (sleep->surf_action_)
+ sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED);
intrusive_ptr_release(sleep);
},
res.get());
simgrid::kernel::activity::SleepImplPtr sleep =
boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
- if (sleep->surf_sleep) {
- sleep->surf_sleep->unref();
- sleep->surf_sleep = nullptr;
+ if (sleep->surf_action_) {
+ sleep->surf_action_->unref();
+ sleep->surf_action_ = nullptr;
}
}
if (self->context_->iwannadie) {
XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host_->get_cname());
- // throw simgrid::kernel::context::Context::StopRequest(); Does not seem to properly kill the actor
+ // throw simgrid::kernel::context::StopRequest(); Does not seem to properly kill the actor
self->context_->stop();
THROW_IMPOSSIBLE;
}
return actor == simix_global->process_list.end() ? nullptr : actor->second;
}
-void SIMIX_process_on_exit_runall(smx_actor_t actor)
-{
- simgrid::s4u::Actor::on_destruction(actor->iface());
- smx_process_exit_status_t exit_status = (actor->context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
- while (not actor->on_exit.empty()) {
- s_smx_process_exit_fun_t exit_fun = actor->on_exit.back();
- actor->on_exit.pop_back();
- (exit_fun.fun)(exit_status, exit_fun.arg);
- }
-}
-
void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data)
{
SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
