X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/939a250d95df492a4ae10048a3ef6744c80187bc..f35db13138682b1be530a509d1eeadeafff84ca7:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 557251a81b..eca8a19f85 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -59,14 +59,12 @@ namespace simgrid { { for (auto arg : boot_processes) { XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname()); - simix_global->create_process_function(arg->name.c_str(), - arg->code, - nullptr, - arg->host, - arg->kill_time, - arg->properties, - arg->auto_restart, - nullptr); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, 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); } } @@ -111,11 +109,6 @@ const char* SIMIX_host_self_get_name() return host->cname(); } -void _SIMIX_host_free_process_arg(void *data) -{ - smx_process_arg_t arg = *(static_cast(data)); - delete arg; -} /** * \brief Add a process to the list of the processes that the host will restart when it comes back * This function add a process to the list of the processes that will be restarted when the host comes @@ -150,8 +143,12 @@ void SIMIX_host_autorestart(sg_host_t host) for (auto arg : process_list) { XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->cname()); - simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->kill_time, - arg->properties, arg->auto_restart, nullptr); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, 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); } process_list.clear(); }