X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d1a33cbb6a28c29a8d432f10785a24f010b59e5..82567f27fa74ddc2b6afa8d9b682bdde15fe3f9c:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 9268dd42ad..984e0ec9aa 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -58,10 +58,8 @@ ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), simcall.issuer = this; } -ActorImpl::~ActorImpl() -{ - delete this->context_; -} +ActorImpl::~ActorImpl() = default; + /* Become an actor in the simulation * * Currently this can only be called by the main thread (once) and only work with some thread factories @@ -90,7 +88,7 @@ ActorImplPtr ActorImpl::attach(std::string name, void* data, s4u::Host* host, XBT_VERB("Create context %s", actor->get_cname()); xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first"); - actor->context_ = simix_global->context_factory->attach(actor); + actor->context_.reset(simix_global->context_factory->attach(actor)); /* Add properties */ if (properties != nullptr) @@ -106,7 +104,7 @@ ActorImplPtr ActorImpl::attach(std::string name, void* data, s4u::Host* host, simix_global->actors_to_run.push_back(actor); intrusive_ptr_add_ref(actor); - auto* context = dynamic_cast(actor->context_); + auto* context = dynamic_cast(actor->context_.get()); xbt_assert(nullptr != context, "Not a suitable context"); context->attach_start(); @@ -444,62 +442,79 @@ void ActorImpl::set_host(s4u::Host* dest) dest->pimpl_->process_list_.push_back(*this); } -ActorImplPtr ActorImpl::create(std::string name, simix::ActorCode code, void* data, s4u::Host* host, - std::unordered_map* properties, ActorImpl* parent_actor) +ActorImplPtr ActorImpl::init(std::string name, s4u::Host* host) { + ActorImpl* actor = new ActorImpl(simgrid::xbt::string(name), host); + actor->set_ppid(this->pid_); - XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); + intrusive_ptr_add_ref(actor); + /* The on_creation() signal must be delayed until there, where the pid and everything is set */ + s4u::Actor::on_creation(actor->iface()); - if (not host->is_on()) { - XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name.c_str(), host->get_cname()); + return ActorImplPtr(actor); +} + +ActorImpl* ActorImpl::start(const simix::ActorCode& code) +{ + xbt_assert(code && host_ != nullptr, "Invalid parameters"); + + 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 create actor on failed host."))); + std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."))); } - ActorImpl* actor = new ActorImpl(simgrid::xbt::string(name), host); + this->code = code; + XBT_VERB("Create context %s", get_cname()); + context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this)); - xbt_assert(code && host != nullptr, "Invalid parameters"); - /* actor data */ - actor->set_user_data(data); - actor->code = code; + XBT_DEBUG("Start context '%s'", get_cname()); + + /* Add the actor to its host's actor list */ + host_->pimpl_->process_list_.push_back(*this); + simix_global->process_list[pid_] = this; + + /* Now insert it in the global actor list and in the actor to run list */ + XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", this, get_cname(), host_->get_cname()); + simix_global->actors_to_run.push_back(this); + return this; +} + +ActorImplPtr ActorImpl::create(std::string name, const simix::ActorCode& code, void* data, s4u::Host* host, + std::unordered_map* properties, ActorImpl* parent_actor) +{ + XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); + + ActorImplPtr actor; if (parent_actor != nullptr) - actor->set_ppid(parent_actor->get_pid()); + actor = parent_actor->init(simgrid::xbt::string(name), host); + else + actor = SIMIX_process_self()->init(simgrid::xbt::string(name), host); - XBT_VERB("Create context %s", actor->get_cname()); - actor->context_ = simix_global->context_factory->create_context(std::move(code), actor); + /* actor data */ + actor->set_user_data(data); /* Add properties */ if (properties != nullptr) for (auto const& kv : *properties) actor->set_property(kv.first, kv.second); - /* Add the actor to its host's actor list */ - host->pimpl_->process_list_.push_back(*actor); - - XBT_DEBUG("Start context '%s'", actor->get_cname()); + actor->start(code); - /* Now insert it in the global actor list and in the actor 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); - - /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - s4u::Actor::on_creation(actor->iface()); - - return ActorImplPtr(actor); + return actor; } -void create_maestro(simix::ActorCode code) +void create_maestro(const std::function& code) { /* Create maestro actor and initialize it */ ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr); if (not code) { - maestro->context_ = simix_global->context_factory->create_context(simix::ActorCode(), maestro); + maestro->context_.reset(simix_global->context_factory->create_context(simix::ActorCode(), maestro)); } else { - maestro->context_ = simix_global->context_factory->create_maestro(code, maestro); + maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro)); } maestro->simcall.issuer = maestro; @@ -689,7 +704,7 @@ void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* dat SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); } -void SIMIX_process_on_exit(smx_actor_t actor, std::function fun, void* data) +void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun, void* data) { xbt_assert(actor, "current process not found: are you in maestro context ?");