return (self_context != nullptr) ? self_context->get_actor() : nullptr;
}
-ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this)
+ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this)
{
pid_ = maxpid++;
simcall.issuer_ = this;
ActorImpl::~ActorImpl()
{
- if (simix_global != nullptr && this != simix_global->maestro_process) {
+ if (simix_global != nullptr && this != simix_global->maestro_) {
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::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
+ actor::simcall([this] { s4u::Actor::on_destruction(*ciface()); });
if (context_.get() != nullptr)
context_->iwannadie = true;
}
{
// This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions.
- XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname());
+ XBT_DEBUG("Attach actor %s on host '%s'", name.c_str(), host->get_cname());
if (not host->is_on()) {
- XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
- throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
+ XBT_WARN("Cannot attach actor '%s' on failed host '%s'", name.c_str(), host->get_cname());
+ throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
}
ActorImpl* actor = new ActorImpl(xbt::string(name), host);
if (properties != nullptr)
actor->set_properties(*properties);
- /* Add the process to it's host process list */
+ /* Add the actor to it's host actor list */
host->pimpl_->add_actor(actor);
- /* Now insert it in the global process list and in the process to run list */
+ /* Now insert it in the global actor list and in the actors to run list */
simix_global->process_list[actor->get_pid()] = actor;
XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname());
simix_global->actors_to_run.push_back(actor);
intrusive_ptr_add_ref(actor);
- auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_.get());
+ auto* context = dynamic_cast<context::AttachContext*>(actor->context_.get());
xbt_assert(nullptr != context, "Not a suitable context");
context->attach_start();
/* The on_creation() signal must be delayed until there, where the pid and everything is set */
- simgrid::s4u::Actor::on_creation(*actor->ciface());
+ s4u::Actor::on_creation(*actor->ciface());
return ActorImplPtr(actor);
}
context->attach_stop();
}
+void ActorImpl::cleanup_from_simix()
+{
+ const std::lock_guard<std::mutex> lock(simix_global->mutex);
+ simix_global->process_list.erase(pid_);
+ if (host_ && host_actor_list_hook.is_linked())
+ host_->pimpl_->remove_actor(this);
+ if (not smx_destroy_list_hook.is_linked()) {
+#if SIMGRID_HAVE_MC
+ xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this);
+#endif
+ simix_global->actors_to_destroy.push_back(*this);
+ }
+}
+
void ActorImpl::cleanup()
{
finished_ = true;
XBT_DEBUG("%s@%s(%ld) should not run anymore", get_cname(), get_host()->get_cname(), get_pid());
- if (this == simix_global->maestro_process) /* Do not cleanup maestro */
+ if (this == simix_global->maestro_) /* Do not cleanup maestro */
return;
XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get());
kill_timer->remove();
kill_timer = nullptr;
}
-
- simix_global->mutex.lock();
-
- simix_global->process_list.erase(pid_);
- if (host_ && host_actor_list_hook.is_linked())
- host_->pimpl_->remove_actor(this);
- if (not smx_destroy_list_hook.is_linked()) {
-#if SIMGRID_HAVE_MC
- xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this);
-#endif
- simix_global->actors_to_destroy.push_back(*this);
- }
-
- simix_global->mutex.unlock();
+ cleanup_from_simix();
context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::kernel::actor::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); });
+ actor::simcall([this] { s4u::Actor::on_termination(*ciface()); });
context_->iwannadie = true;
}
void ActorImpl::kill(ActorImpl* actor)
{
- xbt_assert(actor != simix_global->maestro_process, "Killing maestro is a rather bad idea");
+ xbt_assert(actor != simix_global->maestro_, "Killing maestro is a rather bad idea");
if (actor->finished_) {
XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(),
actor->host_->get_cname());
s4u::Actor* ActorImpl::restart()
{
- xbt_assert(this != simix_global->maestro_process, "Restarting maestro is not supported");
+ xbt_assert(this != simix_global->maestro_, "Restarting maestro is not supported");
XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname());
XBT_OUT();
}
-activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout)
+activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout)
{
activity::ActivityImplPtr sleep = this->sleep(timeout);
actor->on_exit->emplace_back([sleep](bool) {
activity::ActivityImplPtr ActorImpl::sleep(double duration)
{
if (not host_->is_on())
- throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
+ throw_exception(std::make_exception_ptr(HostFailureException(
XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there.")));
auto sleep = new activity::SleepImpl();
void ActorImpl::simcall_answer()
{
- if (this != simix_global->maestro_process){
+ if (this != simix_global->maestro_) {
XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall.call_), (int)simcall.call_,
get_cname(), this);
simcall.call_ = SIMCALL_NONE;
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);
- throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.");
+ throw HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.");
}
this->code_ = code;
}
maestro->simcall.issuer_ = maestro;
- simix_global->maestro_process = maestro;
+ simix_global->maestro_ = maestro;
}
} // namespace actor
