*
* @return The SIMIX process
*/
-smx_actor_t SIMIX_process_self() // XBT_ATTRIB_DEPRECATED_v333
+simgrid::kernel::actor::ActorImpl* SIMIX_process_self() // XBT_ATTRIB_DEPRECATED_v333
{
return simgrid::kernel::actor::ActorImpl::self();
}
-namespace simgrid {
-namespace kernel {
-namespace actor {
+namespace simgrid::kernel::actor {
-static unsigned long maxpid = 0;
-unsigned long get_maxpid()
-{
- return maxpid;
-}
-unsigned long* get_maxpid_addr()
-{
- return &maxpid;
-}
-ActorImpl* ActorImpl::by_pid(aid_t pid)
-{
- return EngineImpl::get_instance()->get_actor_by_pid(pid);
-}
+/*------------------------- [ ActorIDTrait ] -------------------------*/
+unsigned long ActorIDTrait::maxpid_ = 0;
+
+ActorIDTrait::ActorIDTrait(const std::string& name, aid_t ppid) : name_(name), pid_(maxpid_++), ppid_(ppid) {}
ActorImpl* ActorImpl::self()
{
return (self_context != nullptr) ? self_context->get_actor() : nullptr;
}
-ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this)
+ActorImpl::ActorImpl(xbt::string name, s4u::Host* host, aid_t ppid)
+ : ActorIDTrait(std::move(name), ppid), host_(host), piface_(this)
{
- pid_ = maxpid++;
simcall_.issuer_ = this;
stacksize_ = context::stack_size;
}
throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
}
- auto* actor = new ActorImpl(xbt::string(name), host);
+ auto* actor = new ActorImpl(xbt::string(name), host, /*ppid*/ -1);
/* Actor data */
actor->piface_.set_data(data);
actor->code_ = nullptr;
void ActorImpl::cleanup_from_kernel()
{
- xbt_assert(s4u::Actor::is_maestro(), "Cleanup_from_kernel called from '%s' on '%s'", ActorImpl::self()->get_cname(),
- get_cname());
+ xbt_assert(s4u::Actor::is_maestro(), "Cleanup_from_kernel must be called in maestro context");
auto* engine = EngineImpl::get_instance();
- engine->remove_actor(pid_);
+ if (engine->get_actor_by_pid(get_pid()) == nullptr)
+ return; // Already cleaned
+
+ engine->remove_actor(get_pid());
if (host_ && host_actor_list_hook.is_linked())
host_->get_impl()->remove_actor(this);
if (not kernel_destroy_list_hook.is_linked())
}
undaemonize();
+ s4u::Actor::on_termination(*get_ciface());
while (not mailboxes_.empty())
mailboxes_.back()->set_receiver(nullptr);
simcall_.timeout_cb_ = nullptr;
}
- set_wannadie(false); // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- actor::simcall_answered([this] { s4u::Actor::on_termination(*get_ciface()); });
+ /* maybe the actor was killed during a simcall, reset its observer */
+ simcall_.observer_ = nullptr;
+
set_wannadie();
}
void ActorImpl::kill_all() const
{
- for (auto const& kv : EngineImpl::get_instance()->get_actor_list())
- if (kv.second != this)
- this->kill(kv.second);
+ for (auto const& [_, actor] : EngineImpl::get_instance()->get_actor_list())
+ if (actor != this)
+ this->kill(actor);
}
void ActorImpl::set_kill_time(double kill_time)
activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout)
{
- activity::ActivityImplPtr sleep = this->sleep(timeout);
+ activity::ActivityImplPtr sleep_activity = this->sleep(timeout);
if (actor->wannadie() || actor->to_be_freed()) {
- if (sleep->surf_action_)
- sleep->surf_action_->finish(resource::Action::State::FINISHED);
+ if (sleep_activity->surf_action_)
+ sleep_activity->surf_action_->finish(resource::Action::State::FINISHED);
} else {
- actor->on_exit->emplace_back([sleep](bool) {
- if (sleep->surf_action_)
- sleep->surf_action_->finish(resource::Action::State::FINISHED);
+ actor->on_exit->emplace_back([sleep_activity](bool) {
+ if (sleep_activity->surf_action_)
+ sleep_activity->surf_action_->finish(resource::Action::State::FINISHED);
});
}
- return sleep;
+ return sleep_activity;
}
activity::ActivityImplPtr ActorImpl::sleep(double duration)
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();
- sleep->set_name("sleep").set_host(host_).set_duration(duration).start();
- return activity::SleepImplPtr(sleep);
+ auto sleep_activity = new activity::SleepImpl();
+ sleep_activity->set_name("sleep").set_host(host_).set_duration(duration).start();
+ return activity::SleepImplPtr(sleep_activity);
}
void ActorImpl::throw_exception(std::exception_ptr e)
ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) const
{
- auto* actor = new ActorImpl(xbt::string(name), host);
- actor->set_ppid(this->pid_);
+ auto* actor = new ActorImpl(xbt::string(name), host, get_pid());
intrusive_ptr_add_ref(actor);
/* The on_creation() signal must be delayed until there, where the pid and everything is set */
auto* engine = EngineImpl::get_instance();
if (not host_->is_on()) {
- XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name_.c_str(), host_->get_cname());
+ XBT_WARN("Cannot launch actor '%s' on failed host '%s'", get_cname(), host_->get_cname());
intrusive_ptr_release(this);
throw HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.");
}
/* Add the actor to its host's actor list */
host_->get_impl()->add_actor(this);
- engine->add_actor(pid_, this);
+ engine->add_actor(get_pid(), this);
/* Now insert it in the global actor list and in the actor to run list */
engine->add_actor_to_run_list_no_check(this);
{
auto* engine = EngineImpl::get_instance();
/* Create maestro actor and initialize it */
- auto* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr);
+ auto* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr, /*ppid*/ -1);
if (not code) {
maestro->context_.reset(engine->get_context_factory()->create_context(ActorCode(), maestro));
engine->set_maestro(maestro);
}
-} // namespace actor
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::actor
/* needs to be public and without simcall because it is called by exceptions and logging events */
const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATED_v333
