X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7c708d3570410ce5a1316a54f9dda55d2bb46ca..c139b4e36702f58bd8a75e87cf537959da82dbc9:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index e7445fb24a..9569b3967a 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -146,7 +146,8 @@ void SIMIX_process_empty_trash() namespace simgrid { -namespace simix { +namespace kernel { +namespace actor { ActorImpl::~ActorImpl() { @@ -178,11 +179,11 @@ void ActorImpl::daemonize() simgrid::s4u::Actor* ActorImpl::restart() { - XBT_DEBUG("Restarting process %s on %s", getCname(), host->getCname()); + XBT_DEBUG("Restarting process %s on %s", get_cname(), host->get_cname()); // retrieve the arguments of the old process // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? - simgrid::simix::ProcessArg arg; + simgrid::kernel::actor::ProcessArg arg; arg.name = name; arg.code = code; arg.host = host; @@ -249,12 +250,12 @@ void ActorImpl::resume() smx_activity_t ActorImpl::sleep(double duration) { if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->getCname()); + THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->get_cname()); simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); synchro->host = host; synchro->surf_sleep = host->pimpl_cpu->sleep(duration); - synchro->surf_sleep->setData(synchro); + synchro->surf_sleep->set_data(synchro); XBT_DEBUG("Create sleep synchronization %p", synchro); return synchro; @@ -264,7 +265,7 @@ void create_maestro(std::function code) { smx_actor_t maestro = nullptr; /* Create maestro process and initialize it */ - maestro = new simgrid::simix::ActorImpl(); + maestro = new simgrid::kernel::actor::ActorImpl(); maestro->pid = simix_process_maxpid++; maestro->name = ""; maestro->userdata = nullptr; @@ -281,13 +282,14 @@ void create_maestro(std::function code) simix_global->maestro_process = maestro; } +} // namespace actor } } /** @brief Creates and runs the maestro process */ void SIMIX_maestro_create(void (*code)(void*), void* data) { - simgrid::simix::create_maestro(std::bind(code, data)); + simgrid::kernel::actor::create_maestro(std::bind(code, data)); } /** @@ -303,14 +305,14 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v std::map* properties, smx_actor_t parent_process) { - XBT_DEBUG("Start process %s on host '%s'", name, host->getCname()); + XBT_DEBUG("Start process %s on host '%s'", name, host->get_cname()); if (host->isOff()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->getCname()); + XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->get_cname()); return nullptr; } - smx_actor_t process = new simgrid::simix::ActorImpl(); + smx_actor_t process = new simgrid::kernel::actor::ActorImpl(); xbt_assert(code && host != nullptr, "Invalid parameters"); /* Process data */ @@ -345,12 +347,12 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname()); simix_global->process_to_run.push_back(process); intrusive_ptr_add_ref(process); /* Tracing the process creation */ - TRACE_msg_process_create(process->getName(), process->pid, process->host); - + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(process->host->get_name())->createChild(instr_pid(process->ciface()), "ACTOR"); /* The onCreation() signal must be delayed until there, where the pid and everything is set */ simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes simgrid::s4u::Actor::onCreation(tmp); @@ -372,7 +374,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn return nullptr; } - smx_actor_t process = new simgrid::simix::ActorImpl(); + smx_actor_t process = new simgrid::kernel::actor::ActorImpl(); /* Process data */ process->pid = simix_process_maxpid++; process->name = std::string(name); @@ -402,12 +404,13 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname()); simix_global->process_to_run.push_back(process); intrusive_ptr_add_ref(process); /* Tracing the process creation */ - TRACE_msg_process_create(process->getName(), process->pid, process->host); + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(process->host->get_name())->createChild(instr_pid(process->ciface()), "ACTOR"); auto* context = dynamic_cast(process->context); if (not context) @@ -457,13 +460,13 @@ void SIMIX_process_runall() void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { if (process->finished) { - XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->getCname(), - process->host->getCname()); + XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->get_cname(), + process->host->get_cname()); return; } - XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->getCname(), issuer->host->getCname(), process->getCname(), - process->host->getCname()); + XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(), issuer->host->get_cname(), + process->get_cname(), process->host->get_cname()); process->context->iwannadie = 1; process->blocked = 0; @@ -711,7 +714,7 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) */ void SIMIX_process_yield(smx_actor_t self) { - XBT_DEBUG("Yield actor '%s'", self->getCname()); + XBT_DEBUG("Yield actor '%s'", self->get_cname()); /* Go into sleep and return control to maestro */ self->context->suspend(); @@ -726,11 +729,11 @@ void SIMIX_process_yield(smx_actor_t self) SIMIX_process_on_exit_runall(self); /* Add the process to the list of process to restart, only if the host is down */ if (self->auto_restart && self->host->isOff()) { - SIMIX_host_add_auto_restart_process(self->host, self->getCname(), self->code, self->userdata, + SIMIX_host_add_auto_restart_process(self->host, self->get_cname(), self->code, self->userdata, SIMIX_timer_get_date(self->kill_timer), self->getProperties(), self->auto_restart); } - XBT_DEBUG("Process %s@%s is dead", self->getCname(), self->host->getCname()); + XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host->get_cname()); self->context->stop(); } @@ -811,8 +814,8 @@ void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart) { * \param properties the properties of the process * \param auto_restart either it is autorestarting or not. */ -extern "C" smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, - int argc, char** argv, std::map* properties) +smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, + char** argv, std::map* properties) { if (name == nullptr) name = "";