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
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)
simix_global->actors_to_run.push_back(actor);
intrusive_ptr_add_ref(actor);
- auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_);
+ auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_.get());
xbt_assert(nullptr != context, "Not a suitable context");
context->attach_start();
xbt_assert(code && host_ != nullptr, "Invalid parameters");
if (not host_->is_on()) {
- intrusive_ptr_release(this);
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.")));
}
this->code = code;
XBT_VERB("Create context %s", get_cname());
- context_ = simix_global->context_factory->create_context(simix::ActorCode(code), this);
+ context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this));
XBT_DEBUG("Start context '%s'", get_cname());
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(simix::ActorCode(code), maestro);
+ maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro));
}
maestro->simcall.issuer = maestro;
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<void(bool, void*)> fun, void* data)
+void SIMIX_process_on_exit(smx_actor_t actor, const std::function<void(bool, void*)>& fun, void* data)
{
xbt_assert(actor, "current process not found: are you in maestro context ?");
* @param host where the new agent is executed.
* @param properties the properties of the process
*/
-smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data, sg_host_t host,
+smx_actor_t simcall_process_create(std::string name, const simgrid::simix::ActorCode& code, void* data, sg_host_t host,
std::unordered_map<std::string, std::string>* properties)
{
smx_actor_t self = SIMIX_process_self();
- return simgrid::simix::simcall([name, code, data, host, properties, self] {
- return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(code), data, host, properties, self)
- .get();
+ return simgrid::simix::simcall([name, &code, data, host, properties, self] {
+ return simgrid::kernel::actor::ActorImpl::create(std::move(name), code, data, host, properties, self).get();
});
}