simcall.issuer = this;
}
-ActorImpl::~ActorImpl() = default;
+ActorImpl::~ActorImpl()
+{
+ if (simix_global != nullptr && this != simix_global->maestro_process) {
+ if (context_.get() != nullptr) /* the actor was not start()ed yet. This happens if its host was initially off */
+ context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
+ simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
+ if (context_.get() != nullptr)
+ context_->iwannadie = true;
+ }
+}
/* Become an actor in the simulation
*
if (not host->is_on()) {
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
- std::rethrow_exception(
- std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.")));
+ throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
}
ActorImpl* actor = new ActorImpl(xbt::string(name), host);
/* Actor data */
actor->set_user_data(data);
- actor->code = nullptr;
+ actor->code_ = nullptr;
XBT_VERB("Create context %s", actor->get_cname());
xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first");
watched_hosts.insert(get_host()->get_name());
}
- // Execute the termination callbacks
- bool failed = context_->iwannadie;
- for (auto exit_fun = on_exit->crbegin(); exit_fun != on_exit->crend(); ++exit_fun)
- (*exit_fun)(failed);
- if (not has_to_auto_restart())
- on_exit->clear();
+ if (on_exit) {
+ // Execute the termination callbacks
+ bool failed = context_->iwannadie;
+ for (auto exit_fun = on_exit->crbegin(); exit_fun != on_exit->crend(); ++exit_fun)
+ (*exit_fun)(failed);
+ on_exit.reset();
+ }
+ undaemonize();
/* cancel non-blocking activities */
for (auto activity : comms)
simix_global->mutex.unlock();
context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
+ simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); });
context_->iwannadie = true;
}
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 (not host_->is_on())
- this->throw_exception(std::make_exception_ptr(ForcefulKillException("host failed")));
-
/* destroy the blocking synchro if any */
if (waiting_synchro != nullptr) {
waiting_synchro->cancel();
waiting_synchro = nullptr;
}
+
+ // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
+ this->throw_exception(std::make_exception_ptr(ForcefulKillException(host_->is_on() ? "exited" : "host failed")));
}
void ActorImpl::kill(ActorImpl* actor)
if (not daemon_) {
daemon_ = true;
simix_global->daemons.push_back(this);
- SIMIX_process_on_exit(this, [this](bool) {
- auto& vect = simix_global->daemons;
- auto it = std::find(vect.begin(), vect.end(), this);
- xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug.");
-
- /* Don't move the whole content since we don't really care about the order */
- std::swap(*it, vect.back());
- vect.pop_back();
- });
+ }
+}
+
+void ActorImpl::undaemonize()
+{
+ if (daemon_) {
+ auto& vect = simix_global->daemons;
+ auto it = std::find(vect.begin(), vect.end(), this);
+ xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug.");
+ /* Don't move the whole content since we don't really care about the order */
+
+ std::swap(*it, vect.back());
+ vect.pop_back();
+ daemon_ = false;
}
}
if (not host_->is_on()) {
XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name_.c_str(), host_->get_cname());
intrusive_ptr_release(this);
- std::rethrow_exception(
- std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.")));
+ throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.");
}
- this->code = code;
+ this->code_ = code;
XBT_VERB("Create context %s", get_cname());
context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this));
return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
}
-/** @deprecated When this function gets removed, also remove the xbt_ex class, that is only there to help users to
- * transition */
-void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const char* msg)
-{
- xbt_ex e(XBT_THROW_POINT, msg);
- e.category = cat;
- e.value = value;
- actor->throw_exception(std::make_exception_ptr(e));
-}
-
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor)
{
smx_activity_t sync_suspend = actor->suspend(simcall->issuer);
/** @brief Returns the process from PID. */
smx_actor_t SIMIX_process_from_PID(aid_t PID)
{
- auto actor = simix_global->process_list.find(PID);
- return actor == simix_global->process_list.end() ? nullptr : actor->second;
+ auto item = simix_global->process_list.find(PID);
+ if (item == simix_global->process_list.end()) {
+ for (auto& a : simix_global->actors_to_destroy)
+ if (a.get_pid() == PID)
+ return &a;
+ return nullptr; // Not found, even in the trash
+ }
+ return item->second;
}
void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data)
