delete this->context_;
}
+void ActorImpl::exit()
+{
+ context_->iwannadie = true;
+ blocked_ = false;
+ suspended_ = false;
+ exception = nullptr;
+
+ // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
+ if (host_->is_off())
+ this->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed")));
+
+ /* destroy the blocking synchro if any */
+ if (waiting_synchro != nullptr) {
+
+ activity::ExecImplPtr exec = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro);
+ activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro);
+ activity::SleepImplPtr sleep = boost::dynamic_pointer_cast<activity::SleepImpl>(waiting_synchro);
+ activity::RawImplPtr raw = boost::dynamic_pointer_cast<activity::RawImpl>(waiting_synchro);
+ activity::IoImplPtr io = boost::dynamic_pointer_cast<activity::IoImpl>(waiting_synchro);
+
+ if (exec != nullptr && exec->surf_action_) {
+ exec->cancel();
+ exec->surf_action_->unref();
+ exec->surf_action_ = nullptr;
+ } else if (comm != nullptr) {
+ comms.remove(waiting_synchro);
+ comm->cancel();
+ // Remove first occurrence of &process->simcall:
+ auto i = boost::range::find(waiting_synchro->simcalls_, &simcall);
+ if (i != waiting_synchro->simcalls_.end())
+ waiting_synchro->simcalls_.remove(&simcall);
+ } else if (sleep != nullptr) {
+ if (sleep->surf_action_)
+ sleep->surf_action_->cancel();
+ sleep->post();
+ } else if (raw != nullptr) {
+ SIMIX_synchro_stop_waiting(this, &simcall);
+ } else if (io != nullptr) {
+ io->cancel();
+ } else {
+ simgrid::kernel::activity::ActivityImplPtr activity = waiting_synchro;
+ xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(),
+ simgrid::xbt::demangle(typeid(activity).name()).get());
+ }
+
+ waiting_synchro = nullptr;
+ }
+}
+
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);
+ this->exit();
kill_timer = nullptr;
});
}
simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this);
// kill the old process
- SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self());
+ (this == simix_global->maestro_process) ? this->exit() : SIMIX_process_kill(this, SIMIX_process_self());
// start the new process
ActorImplPtr actor =
return nullptr;
} else {
- activity::ExecImplPtr exec = activity::ExecImplPtr(new activity::ExecImpl("suspend", "", nullptr, this->host_));
- exec->start(0.0, 1.0, 0.0);
- return exec;
+ return activity::ExecImplPtr(new activity::ExecImpl("suspend", "", nullptr, this->host_))->start(0.0, 1.0, 0.0);
}
}
void ActorImpl::resume()
{
- XBT_IN("process = %p", this);
+ XBT_IN("actor = %p", this);
if (context_->iwannadie) {
XBT_VERB("Ignoring request to suspend an actor that is currently dying.");
throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there.")));
- simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
- synchro->host = host_;
- synchro->surf_action_ = host_->pimpl_cpu->sleep(duration);
- synchro->surf_action_->set_data(synchro);
- XBT_DEBUG("Create sleep synchronization %p", synchro);
-
- return synchro;
+ return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_))
+ ->start(duration);
}
void ActorImpl::throw_exception(std::exception_ptr e)
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(waiting_synchro);
- if (exec != nullptr && exec->surf_action_)
- exec->surf_action_->cancel();
+ if (exec != nullptr)
+ exec->cancel();
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(waiting_synchro);
simgrid::kernel::activity::IoImplPtr io =
boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(waiting_synchro);
if (io != nullptr) {
- delete io.get();
+ io->cancel();
}
}
waiting_synchro = nullptr;
(issuer == nullptr || issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(),
actor->host_->get_cname());
- actor->context_->iwannadie = true;
- actor->blocked_ = false;
- actor->suspended_ = false;
- actor->exception = nullptr;
-
- // 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::StopRequest("host failed")));
-
- /* destroy the blocking synchro if any */
- if (actor->waiting_synchro != nullptr) {
-
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(actor->waiting_synchro);
- simgrid::kernel::activity::CommImplPtr comm =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(actor->waiting_synchro);
- simgrid::kernel::activity::SleepImplPtr sleep =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(actor->waiting_synchro);
- simgrid::kernel::activity::RawImplPtr raw =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(actor->waiting_synchro);
- simgrid::kernel::activity::IoImplPtr io =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(actor->waiting_synchro);
-
- if (exec != nullptr) {
- if (exec->surf_action_) {
- exec->surf_action_->cancel();
- exec->surf_action_->unref();
- exec->surf_action_ = nullptr;
- }
- } else if (comm != nullptr) {
- actor->comms.remove(actor->waiting_synchro);
- comm->cancel();
- // Remove first occurrence of &process->simcall:
- auto i = boost::range::find(actor->waiting_synchro->simcalls_, &actor->simcall);
- if (i != actor->waiting_synchro->simcalls_.end())
- actor->waiting_synchro->simcalls_.remove(&actor->simcall);
- } else if (sleep != nullptr) {
- if (sleep->surf_action_)
- sleep->surf_action_->cancel();
- sleep->post();
- } else if (raw != nullptr) {
- SIMIX_synchro_stop_waiting(actor, &actor->simcall);
+ actor->exit();
- } else if (io != nullptr) {
- delete io.get();
- } else {
- simgrid::kernel::activity::ActivityImplPtr activity = actor->waiting_synchro;
- xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(),
- simgrid::xbt::demangle(typeid(activity).name()).get());
- }
-
- actor->waiting_synchro = nullptr;
- }
if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) ==
end(simix_global->process_to_run) &&
actor != issuer) {
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(actor->waiting_synchro);
- if (exec != nullptr && exec->surf_action_)
- exec->surf_action_->cancel();
+ if (exec != nullptr)
+ exec->cancel();
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(actor->waiting_synchro);
simgrid::kernel::activity::IoImplPtr io =
boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(actor->waiting_synchro);
if (io != nullptr) {
- delete io.get();
+ io->cancel();
}
}
actor->waiting_synchro = nullptr;
