X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3f6c5e832f9966433370562ef59fc4670038c94..5e1b4fa835cedc144a2ebe97fda0d139d63d3058:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 2329d65388..9715c65360 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -21,14 +21,15 @@ #include -#include "src/surf/surf_interface.hpp" #include "smx_private.h" +#include "src/kernel/activity/SynchroIo.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" #include "src/mc/mc_replay.h" -#include "src/mc/Client.hpp" +#include "src/mc/remote/Client.hpp" #include "src/msg/msg_private.h" -#include "src/kernel/activity/SynchroSleep.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" -#include "src/kernel/activity/SynchroIo.hpp" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/surf_interface.hpp" #ifdef HAVE_SMPI #include "src/smpi/private.h" @@ -132,7 +133,7 @@ void SIMIX_process_cleanup(smx_actor_t process) } XBT_DEBUG("%p should not be run anymore",process); - xbt_swag_remove(process, simix_global->process_list); + simix_global->process_list.erase(process->pid); if (process->host) xbt_swag_remove(process, sg_host_simix(process->host)->process_list); xbt_swag_insert(process, simix_global->process_to_destroy); @@ -174,7 +175,7 @@ ActorImpl::~ActorImpl() void create_maestro(std::function code) { smx_actor_t maestro = nullptr; - /* Create maestro process and intilialize it */ + /* Create maestro process and initialize it */ maestro = new simgrid::simix::ActorImpl(); maestro->pid = simix_process_maxpid++; maestro->ppid = -1; @@ -203,30 +204,6 @@ void SIMIX_maestro_create(void (*code)(void*), void* data) simgrid::simix::create_maestro(std::bind(code, data)); } -/** - * \brief Stops a process. - * - * Stops the process, execute all the registered on_exit functions, - * register it to the list of the process to restart if needed - * and stops its context. - */ -void SIMIX_process_stop(smx_actor_t arg) { - arg->finished = true; - /* execute the on_exit functions */ - SIMIX_process_on_exit_runall(arg); - /* Add the process to the list of process to restart, only if the host is down */ - if (arg->auto_restart && arg->host->isOff()) { - SIMIX_host_add_auto_restart_process(arg->host, arg->name.c_str(), - arg->code, arg->data, - SIMIX_timer_get_date(arg->kill_timer), - arg->properties, - arg->auto_restart); - } - XBT_DEBUG("Process %s (%s) is dead", - arg->name.c_str(), sg_host_get_name(arg->host)); - arg->context->stop(); -} - /** * \brief Internal function to create a process. * @@ -248,10 +225,10 @@ smx_actor_t SIMIX_process_create( { smx_actor_t process = nullptr; - XBT_DEBUG("Start process %s on host '%s'", name, host->name().c_str()); + XBT_DEBUG("Start process %s on host '%s'", name, host->cname()); if (host->isOff()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->name().c_str()); + XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->cname()); return nullptr; } else { @@ -302,21 +279,19 @@ smx_actor_t SIMIX_process_create( XBT_DEBUG("Start context '%s'", process->name.c_str()); /* Now insert it in the global process list and in the process to run list */ - xbt_swag_insert(process, simix_global->process_list); - XBT_DEBUG("Inserting %s(%s) in the to_run list", - process->name.c_str(), sg_host_get_name(host)); + simix_global->process_list[process->pid] = process; + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); if (kill_time > SIMIX_get_clock() && simix_global->kill_process_function) { - XBT_DEBUG("Process %s(%s) will be kill at time %f", - process->name.c_str(), sg_host_get_name(process->host), kill_time); + XBT_DEBUG("Process %s(%s) will be kill at time %f", process->cname(), process->host->cname(), kill_time); process->kill_timer = SIMIX_timer_set(kill_time, [=]() { simix_global->kill_process_function(process); }); } /* Tracing the process creation */ - TRACE_msg_process_create(process->name.c_str(), process->pid, process->host); + TRACE_msg_process_create(process->cname(), process->pid, process->host); } return process; } @@ -382,13 +357,12 @@ smx_actor_t SIMIX_process_attach( xbt_swag_insert(process, sg_host_simix(host)->process_list); /* Now insert it in the global process list and in the process to run list */ - xbt_swag_insert(process, simix_global->process_list); - XBT_DEBUG("Inserting %s(%s) in the to_run list", - process->name.c_str(), sg_host_get_name(host)); + simix_global->process_list[process->pid] = process; + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); /* Tracing the process creation */ - TRACE_msg_process_create(process->name.c_str(), process->pid, process->host); + TRACE_msg_process_create(process->cname(), process->pid, process->host); auto context = dynamic_cast(process->context); if (!context) @@ -449,8 +423,7 @@ void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_actor_t process) { */ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { - XBT_DEBUG("Killing process %s on %s", - process->name.c_str(), sg_host_get_name(process->host)); + XBT_DEBUG("Killing process %s@%s", process->cname(), process->host->cname()); process->context->iwannadie = 1; process->blocked = 0; @@ -510,6 +483,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { /** @brief Ask another process to raise the given exception * + * @param process The process that should raise that exception * @param cat category of exception * @param value value associated to the exception * @param msg string information associated to the exception @@ -566,13 +540,9 @@ void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) { */ void SIMIX_process_killall(smx_actor_t issuer, int reset_pid) { - smx_actor_t p = nullptr; - - while ((p = (smx_actor_t) xbt_swag_extract(simix_global->process_list))) { - if (p != issuer) { - SIMIX_process_kill(p,issuer); - } - } + for (auto kv : simix_global->process_list) + if (kv.second != issuer) + SIMIX_process_kill(kv.second, issuer); if (reset_pid > 0) simix_process_maxpid = reset_pid; @@ -656,7 +626,7 @@ int SIMIX_process_get_maxpid() { int SIMIX_process_count() { - return xbt_swag_size(simix_global->process_list); + return simix_global->process_list.size(); } int SIMIX_process_get_PID(smx_actor_t self) @@ -707,11 +677,9 @@ const char* SIMIX_process_self_get_name() { smx_actor_t SIMIX_process_get_by_name(const char* name) { - smx_actor_t proc; - xbt_swag_foreach(proc, simix_global->process_list) { - if (proc->name == name) - return proc; - } + for (auto kv : simix_global->process_list) + if (kv.second->name == name) + return kv.second; return nullptr; } @@ -789,13 +757,12 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) { sg_host_t host = process->host; - /* check if the host is active */ if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host)); + THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->cname()); simgrid::kernel::activity::Sleep *synchro = new simgrid::kernel::activity::Sleep(); synchro->host = host; - synchro->surf_sleep = surf_host_sleep(host, duration); + synchro->surf_sleep = host->pimpl_cpu->sleep(duration); synchro->surf_sleep->setData(synchro); XBT_DEBUG("Create sleep synchronization %p", synchro); @@ -839,7 +806,19 @@ void SIMIX_process_yield(smx_actor_t self) if (self->context->iwannadie){ XBT_DEBUG("I wanna die!"); - SIMIX_process_stop(self); + self->finished = true; + /* execute the on_exit functions */ + 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->cname(), + self->code, self->data, + SIMIX_timer_get_date(self->kill_timer), + self->properties, + self->auto_restart); + } + XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->cname()); + self->context->stop(); } if (self->suspended) { @@ -889,19 +868,16 @@ xbt_dynar_t SIMIX_process_get_runnable() */ smx_actor_t SIMIX_process_from_PID(int PID) { - smx_actor_t proc; - xbt_swag_foreach(proc, simix_global->process_list) { - if (proc->pid == static_cast (PID)) - return proc; - } - return nullptr; + if (simix_global->process_list.find(PID) == simix_global->process_list.end()) + return nullptr; + return simix_global->process_list.at(PID); } /** @brief returns a dynar containing all currently existing processes */ xbt_dynar_t SIMIX_processes_as_dynar() { - smx_actor_t proc; xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t),nullptr); - xbt_swag_foreach(proc, simix_global->process_list) { + for (auto kv : simix_global->process_list) { + smx_actor_t proc = kv.second; xbt_dynar_push(res,&proc); } return res; @@ -942,7 +918,7 @@ smx_actor_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_actor_t p } /** @brief Restart a process, starting it again from the beginning. */ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) { - XBT_DEBUG("Restarting process %s on %s", process->name.c_str(), sg_host_get_name(process->host)); + XBT_DEBUG("Restarting process %s on %s", process->cname(), process->host->cname()); //retrieve the arguments of the old process //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? @@ -977,7 +953,7 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){ * \param code the main function of the process * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be nullptr. * It can be retrieved with the function \ref simcall_process_get_data. - * \param hostname name of the host where the new agent is executed. + * \param host where the new agent is executed. * \param kill_time time when the process is killed * \param argc first argument passed to \a code * \param argv second argument passed to \a code