X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93298f333e0a978ac17aee86fa69b64e14668f94..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index e51e517c89..8fdad95a22 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -25,8 +25,8 @@ #include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/kernel/activity/SynchroSleep.hpp" -#include "src/mc/Client.hpp" #include "src/mc/mc_replay.h" +#include "src/mc/remote/Client.hpp" #include "src/msg/msg_private.h" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" @@ -133,9 +133,9 @@ 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_remove(process, process->host->extension()->process_list); xbt_swag_insert(process, simix_global->process_to_destroy); process->context->iwannadie = 0; @@ -175,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; @@ -218,7 +218,6 @@ smx_actor_t SIMIX_process_create( std::function code, void *data, sg_host_t host, - double kill_time, xbt_dict_t properties, int auto_restart, smx_actor_t parent_process) @@ -274,22 +273,15 @@ smx_actor_t SIMIX_process_create( process->properties = properties; /* Add the process to it's host process list */ - xbt_swag_insert(process, sg_host_simix(host)->process_list); + xbt_swag_insert(process, host->extension()->process_list); 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); + 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->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->cname(), process->pid, process->host); } @@ -354,10 +346,10 @@ smx_actor_t SIMIX_process_attach( process->properties = properties; /* Add the process to it's host process list */ - xbt_swag_insert(process, sg_host_simix(host)->process_list); + xbt_swag_insert(process, host->extension()->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); + 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); @@ -483,6 +475,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 @@ -539,13 +532,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; @@ -562,9 +551,9 @@ void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_actor_t process void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest) { xbt_assert((process != nullptr), "Invalid parameters"); - xbt_swag_remove(process, sg_host_simix(process->host)->process_list); + xbt_swag_remove(process, process->host->extension()->process_list); process->host = dest; - xbt_swag_insert(process, sg_host_simix(dest)->process_list); + xbt_swag_insert(process, dest->extension()->process_list); } @@ -629,7 +618,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) @@ -647,7 +636,7 @@ void* SIMIX_process_self_get_data() if (!self) { return nullptr; } - return SIMIX_process_get_data(self); + return self->data; } void SIMIX_process_self_set_data(void *data) @@ -657,11 +646,6 @@ void SIMIX_process_self_set_data(void *data) SIMIX_process_set_data(self, data); } -void* SIMIX_process_get_data(smx_actor_t process) -{ - return process->data; -} - void SIMIX_process_set_data(smx_actor_t process, void *data) { process->data = data; @@ -680,11 +664,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; } @@ -796,7 +778,7 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) */ void SIMIX_process_yield(smx_actor_t self) { - XBT_DEBUG("Yield process '%s'", self->name.c_str()); + XBT_DEBUG("Yield actor '%s'", self->cname()); /* Go into sleep and return control to maestro */ self->context->suspend(); @@ -873,19 +855,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; @@ -943,8 +922,12 @@ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) { SIMIX_process_kill(process, issuer); //start the new process - return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, - arg.kill_time, arg.properties, arg.auto_restart, nullptr); + smx_actor_t actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, + arg.properties, arg.auto_restart, nullptr); + if (arg.kill_time >= 0) + simcall_process_set_kill_time(actor, arg.kill_time); + + return actor; } void SIMIX_segment_index_set(smx_actor_t proc, int index){ @@ -961,7 +944,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 @@ -972,7 +955,6 @@ smx_actor_t simcall_process_create(const char *name, xbt_main_func_t code, void *data, sg_host_t host, - double kill_time, int argc, char **argv, xbt_dict_t properties, int auto_restart) @@ -983,21 +965,17 @@ smx_actor_t simcall_process_create(const char *name, for (int i = 0; i != argc; ++i) xbt_free(argv[i]); xbt_free(argv); - smx_actor_t res = simcall_process_create(name, - std::move(wrapped_code), - data, host, kill_time, properties, auto_restart); + smx_actor_t res = simcall_process_create(name, std::move(wrapped_code), data, host, properties, auto_restart); return res; } -smx_actor_t simcall_process_create( - const char *name, std::function code, void *data, - sg_host_t host, double kill_time, - xbt_dict_t properties, int auto_restart) +smx_actor_t simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, + xbt_dict_t properties, int auto_restart) { if (name == nullptr) name = ""; smx_actor_t self = SIMIX_process_self(); - return simgrid::simix::kernelImmediate([&] { - return SIMIX_process_create(name, std::move(code), data, host, kill_time, properties, auto_restart, self); + return simgrid::simix::kernelImmediate([name, code, data, host, properties, auto_restart, self] { + return SIMIX_process_create(name, std::move(code), data, host, properties, auto_restart, self); }); }