X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca9c986801463f350a0564a786d3334eb3a2c45a..ab2f258eb5e0f714e4219125e51c118d958bb66d:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 36d847fb8d..4d2b7ba979 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -31,7 +31,7 @@ #include "src/surf/surf_interface.hpp" #ifdef HAVE_SMPI -#include "src/smpi/private.h" +#include "src/smpi/private.hpp" #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); @@ -167,20 +167,49 @@ void ActorImpl::daemonize() } } -smx_activity_t ActorImpl::suspend(smx_actor_t issuer) +ActorImpl* ActorImpl::restart(ActorImpl* issuer) +{ + XBT_DEBUG("Restarting process %s on %s", cname(), host->getCname()); + + // retrieve the arguments of the old process + // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? + simgrid::simix::ProcessArg arg; + arg.name = name; + arg.code = code; + arg.host = host; + arg.kill_time = SIMIX_timer_get_date(kill_timer); + arg.data = userdata; + arg.properties = nullptr; + arg.auto_restart = auto_restart; + + // kill the old process + SIMIX_process_kill(this, issuer); + + // start the new process + ActorImpl* actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, + arg.properties, nullptr); + if (arg.kill_time >= 0) + simcall_process_set_kill_time(actor, arg.kill_time); + if (arg.auto_restart) + simcall_process_auto_restart_set(actor, arg.auto_restart); + + return actor; +} + +smx_activity_t ActorImpl::suspend(ActorImpl* issuer) { if (suspended) { - XBT_DEBUG("Process '%s' is already suspended", name.c_str()); + XBT_DEBUG("Actor '%s' is already suspended", name.c_str()); return nullptr; } suspended = 1; - /* If we are suspending another process that is waiting on a sync, suspend its synchronization. */ + /* If we are suspending another actor that is waiting on a sync, suspend its synchronization. */ if (this != issuer) { if (waiting_synchro) waiting_synchro->suspend(); - /* If the other process is not waiting, its suspension is delayed to when the process is rescheduled. */ + /* If the other actor is not waiting, its suspension is delayed to when the actor is rescheduled. */ return nullptr; } else { @@ -193,7 +222,7 @@ void ActorImpl::resume() XBT_IN("process = %p", this); if (context->iwannadie) { - XBT_VERB("Ignoring request to suspend a process that is currently dying."); + XBT_VERB("Ignoring request to suspend an actor that is currently dying."); return; } @@ -201,7 +230,7 @@ void ActorImpl::resume() return; suspended = 0; - /* resume the synchronization that was blocking the resumed process. */ + /* resume the synchronization that was blocking the resumed actor. */ if (waiting_synchro) waiting_synchro->resume(); @@ -229,7 +258,7 @@ void create_maestro(std::function code) maestro = new simgrid::simix::ActorImpl(); maestro->pid = simix_process_maxpid++; maestro->name = ""; - maestro->data = nullptr; + maestro->userdata = nullptr; if (not code) { maestro->context = SIMIX_context_new(std::function(), nullptr, maestro); @@ -280,7 +309,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v process->pid = simix_process_maxpid++; process->name = simgrid::xbt::string(name); process->host = host; - process->data = data; + process->userdata = data; process->simcall.issuer = process; if (parent_process != nullptr) { @@ -346,7 +375,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn process->pid = simix_process_maxpid++; process->name = std::string(name); process->host = host; - process->data = data; + process->userdata = data; process->simcall.issuer = process; if (parent_process != nullptr) { @@ -616,20 +645,14 @@ void* SIMIX_process_self_get_data() if (not self) { return nullptr; } - return self->data; + return self->getUserData(); } void SIMIX_process_self_set_data(void *data) { - smx_actor_t self = SIMIX_process_self(); - - SIMIX_process_set_data(self, data); + SIMIX_process_self()->setUserData(data); } -void SIMIX_process_set_data(smx_actor_t process, void *data) -{ - process->data = data; -} /* needs to be public and without simcall because it is called by exceptions and logging events */ @@ -759,11 +782,8 @@ 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->cname(), - self->code, self->data, - SIMIX_timer_get_date(self->kill_timer), - self->properties, - self->auto_restart); + SIMIX_host_add_auto_restart_process(self->host, self->cname(), self->code, self->userdata, + SIMIX_timer_get_date(self->kill_timer), self->properties, self->auto_restart); } XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->getCname()); self->context->stop(); @@ -850,37 +870,10 @@ void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart) { } smx_actor_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_actor_t process) { - return SIMIX_process_restart(process, simcall->issuer); -} -/** @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->cname(), process->host->getCname()); - - //retrieve the arguments of the old process - //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? - simgrid::simix::ProcessArg arg; - arg.name = process->name; - arg.code = process->code; - arg.host = process->host; - arg.kill_time = SIMIX_timer_get_date(process->kill_timer); - arg.data = process->data; - arg.properties = nullptr; - arg.auto_restart = process->auto_restart; - - //kill the old process - SIMIX_process_kill(process, issuer); - - //start the new process - smx_actor_t actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, - arg.properties, nullptr); - if (arg.kill_time >= 0) - simcall_process_set_kill_time(actor, arg.kill_time); - if (arg.auto_restart) - simcall_process_auto_restart_set(actor, arg.auto_restart); - - return actor; + return process->restart(simcall->issuer); } +/** @brief Restart a process, starting it again from the beginning. */ /** * \ingroup simix_process_management * \brief Creates and runs a new SIMIX process. @@ -889,7 +882,8 @@ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) { * * \param name a name for the process. It is for user-level information and can be nullptr. * \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. + * \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 host where the new agent is executed. * \param kill_time time when the process is killed