X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fdff8d6a639190cfc5be5b33105dab51c3c0c6d..69901c51b9fbfb0a3e5dbc8a8ac1678adfcb0465:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 3356c16cae..445aabc6d3 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,20 +10,20 @@ #include -#include -#include -#include -#include -#include +#include "xbt/dict.h" +#include "xbt/ex.hpp" +#include "xbt/functional.hpp" +#include "xbt/log.h" +#include "xbt/sysdep.h" -#include +#include "simgrid/s4u/Host.hpp" -#include +#include "mc/mc.h" #include "smx_private.h" +#include "src/kernel/activity/SleepImpl.hpp" #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/remote/Client.hpp" #include "src/msg/msg_private.h" @@ -74,7 +73,7 @@ smx_actor_t SIMIX_process_self() */ int SIMIX_process_has_pending_comms(smx_actor_t process) { - return xbt_fifo_size(process->comms) > 0; + return process->comms.size() > 0; } /** @@ -82,26 +81,25 @@ int SIMIX_process_has_pending_comms(smx_actor_t process) { */ void SIMIX_process_cleanup(smx_actor_t process) { - XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", - process->name.c_str(), process, process->waiting_synchro); + XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process, process->waiting_synchro); process->finished = true; SIMIX_process_on_exit_runall(process); /* Unregister from the kill timer if any */ if (process->kill_timer != nullptr) - SIMIX_timer_remove(process->kill_timer); + SIMIX_timer_remove(process->kill_timer); xbt_os_mutex_acquire(simix_global->mutex); /* cancel non-blocking communications */ - smx_activity_t synchro = static_cast(xbt_fifo_pop(process->comms)); - while (synchro != nullptr) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + smx_activity_t synchro = static_cast(process->comms.front()); + while (not process->comms.empty()) { + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); /* make sure no one will finish the comm after this process is destroyed, * because src_proc or dst_proc would be an invalid pointer */ - comm->cancel(); if (comm->src_proc == process) { XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", @@ -113,29 +111,27 @@ void SIMIX_process_cleanup(smx_actor_t process) XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"); else comm->unref(); - - } - else if (comm->dst_proc == process){ + } else if (comm->dst_proc == process) { XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm, (int)comm->state, comm->src_proc, comm->dst_proc); comm->dst_proc = nullptr; if (comm->detached && comm->src_proc != nullptr) { /* the comm will be freed right now, remove it from the sender */ - xbt_fifo_remove(comm->src_proc->comms, comm); + comm->src_proc->comms.remove(comm); } - - comm->unref(); } else { xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro); } - synchro = static_cast(xbt_fifo_pop(process->comms)); + process->comms.pop_front(); + synchro = static_cast(process->comms.front()); + comm->cancel(); } XBT_DEBUG("%p should not be run anymore",process); 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; @@ -145,16 +141,16 @@ void SIMIX_process_cleanup(smx_actor_t process) /** * Garbage collection * - * Should be called some time to time to free the memory allocated for processes - * that have finished (or killed). + * Should be called some time to time to free the memory allocated for processes that have finished (or killed). */ void SIMIX_process_empty_trash() { - smx_actor_t process = nullptr; + smx_actor_t process = static_cast(xbt_swag_extract(simix_global->process_to_destroy)); - while ((process = (smx_actor_t) xbt_swag_extract(simix_global->process_to_destroy))) { + while (process) { XBT_DEBUG("Getting rid of %p",process); intrusive_ptr_release(process); + process = static_cast(xbt_swag_extract(simix_global->process_to_destroy)); } } @@ -164,12 +160,36 @@ namespace simix { ActorImpl::~ActorImpl() { delete this->context; - if (this->properties) - xbt_dict_free(&this->properties); - if (this->comms != nullptr) - xbt_fifo_free(this->comms); - if (this->on_exit) - xbt_dynar_free(&this->on_exit); + xbt_dict_free(&this->properties); +} + +static int dying_daemon(void* exit_status, void* data) +{ + std::vector* vect = &simix_global->daemons; + + auto it = std::find(vect->begin(), vect->end(), static_cast(data)); + xbt_assert(it != vect->end(), "The dying daemon is not a daemon after all. Please report that bug."); + + /* Don't move the whole content since we don't really care about the order */ + std::swap(*it, vect->back()); + vect->pop_back(); + + return 0; +} +/** This process will be terminated automatically when the last non-daemon process finishes */ +void ActorImpl::daemonize() +{ + if (not daemon) { + daemon = true; + simix_global->daemons.push_back(this); + SIMIX_process_on_exit(this, dying_daemon, this); + } +} + +/** Whether this process is daemonized */ +bool ActorImpl::isDaemon() +{ + return daemon; } void create_maestro(std::function code) @@ -178,14 +198,13 @@ void create_maestro(std::function code) /* Create maestro process and initialize it */ maestro = new simgrid::simix::ActorImpl(); maestro->pid = simix_process_maxpid++; - maestro->ppid = -1; maestro->name = ""; maestro->data = nullptr; - if (!code) { + if (not code) { maestro->context = SIMIX_context_new(std::function(), nullptr, maestro); } else { - if (!simix_global) + if (not simix_global) xbt_die("simix is not initialized, please call MSG_init first"); maestro->context = simix_global->context_factory->create_maestro(code, maestro); @@ -213,17 +232,9 @@ void SIMIX_maestro_create(void (*code)(void*), void* data) * * \return the process created */ -smx_actor_t SIMIX_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 parent_process) -{ - smx_actor_t process = nullptr; +smx_actor_t SIMIX_process_create(const char* name, std::function code, void* data, simgrid::s4u::Host* host, + xbt_dict_t properties, smx_actor_t parent_process) +{ XBT_DEBUG("Start process %s on host '%s'", name, host->cname()); @@ -231,77 +242,62 @@ smx_actor_t SIMIX_process_create( XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->cname()); return nullptr; } - else { - process = new simgrid::simix::ActorImpl(); - - xbt_assert(code && host != nullptr, "Invalid parameters"); - /* Process data */ - process->pid = simix_process_maxpid++; - process->name = simgrid::xbt::string(name); - process->host = host; - process->data = data; - process->comms = xbt_fifo_new(); - process->simcall.issuer = process; - /* Initiliaze data segment to default value */ - SIMIX_segment_index_set(process, -1); - - if (parent_process != nullptr) { - process->ppid = parent_process->pid; - /* SMPI process have their own data segment and each other inherit from their father */ + + smx_actor_t process = new simgrid::simix::ActorImpl(); + + xbt_assert(code && host != nullptr, "Invalid parameters"); + /* Process data */ + process->pid = simix_process_maxpid++; + process->name = simgrid::xbt::string(name); + process->host = host; + process->data = data; + process->simcall.issuer = process; + + if (parent_process != nullptr) { + process->ppid = parent_process->pid; +/* SMPI process have their own data segment and each other inherit from their father */ #if HAVE_SMPI - if( smpi_privatize_global_variables) { - if (parent_process->pid != 0) { - SIMIX_segment_index_set(process, parent_process->segment_index); - } else { - SIMIX_segment_index_set(process, process->pid - 1); - } - } + if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { + if (parent_process->pid != 0) { + SIMIX_segment_index_set(process, parent_process->segment_index); + } else { + SIMIX_segment_index_set(process, process->pid - 1); + } + } #endif - } else { - process->ppid = -1; - } + } - /* Process data for auto-restart */ - process->auto_restart = auto_restart; - process->code = code; + process->code = code; - XBT_VERB("Create context %s", process->name.c_str()); - process->context = SIMIX_context_new( - std::move(code), - simix_global->cleanup_process_function, process); + XBT_VERB("Create context %s", process->name.c_str()); + process->context = SIMIX_context_new(std::move(code), simix_global->cleanup_process_function, process); - /* Add properties */ - process->properties = properties; + /* Add properties */ + process->properties = properties; - /* Add the process to it's host process list */ - xbt_swag_insert(process, sg_host_simix(host)->process_list); + /* Make sure that the process is initialized for simix, in case we are called from the Host::onCreation signal */ + if (host->extension() == nullptr) + host->extension_set(new simgrid::simix::Host()); - XBT_DEBUG("Start context '%s'", process->name.c_str()); + /* Add the process to its 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 */ - 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); + XBT_DEBUG("Start context '%s'", process->name.c_str()); - 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); - }); - } + /* 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->cname(), host->cname()); + xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); + intrusive_ptr_add_ref(process); + + /* Tracing the process creation */ + TRACE_msg_process_create(process->cname(), process->pid, process->host); - /* Tracing the process creation */ - TRACE_msg_process_create(process->cname(), process->pid, process->host); - } return process; } -smx_actor_t SIMIX_process_attach( - const char* name, - void *data, - const char* hostname, - xbt_dict_t properties, - smx_actor_t parent_process) +smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, xbt_dict_t properties, + smx_actor_t parent_process) { // This is mostly a copy/paste from SIMIX_process_new(), // it'd be nice to share some code between those two functions. @@ -321,16 +317,13 @@ smx_actor_t SIMIX_process_attach( process->name = std::string(name); process->host = host; process->data = data; - process->comms = xbt_fifo_new(); process->simcall.issuer = process; - process->ppid = -1; - /* Initiliaze data segment to default value */ - SIMIX_segment_index_set(process, -1); + if (parent_process != nullptr) { process->ppid = parent_process->pid; /* SMPI process have their own data segment and each other inherit from their father */ #if HAVE_SMPI - if (smpi_privatize_global_variables) { + if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { if (parent_process->pid != 0) { SIMIX_segment_index_set(process, parent_process->segment_index); } else { @@ -341,11 +334,10 @@ smx_actor_t SIMIX_process_attach( } /* Process data for auto-restart */ - process->auto_restart = false; process->code = nullptr; XBT_VERB("Create context %s", process->name.c_str()); - if (!simix_global) + if (not simix_global) xbt_die("simix is not initialized, please call MSG_init first"); process->context = simix_global->context_factory->attach( simix_global->cleanup_process_function, process); @@ -354,7 +346,7 @@ 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 */ simix_global->process_list[process->pid] = process; @@ -365,7 +357,7 @@ smx_actor_t SIMIX_process_attach( TRACE_msg_process_create(process->cname(), process->pid, process->host); auto context = dynamic_cast(process->context); - if (!context) + if (not context) xbt_die("Not a suitable context"); context->attach_start(); @@ -375,7 +367,7 @@ smx_actor_t SIMIX_process_attach( void SIMIX_process_detach() { auto context = dynamic_cast(SIMIX_context_self()); - if (!context) + if (not context) xbt_die("Not a suitable context"); simix_global->cleanup_process_function(context->process()); @@ -433,34 +425,34 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { /* destroy the blocking synchro if any */ if (process->waiting_synchro) { - simgrid::kernel::activity::Exec *exec = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Comm *comm = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Sleep *sleep = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::RawImplPtr raw = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::IoImplPtr io = + boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { exec->unref(); } else if (comm != nullptr) { - xbt_fifo_remove(process->comms, process->waiting_synchro); + process->comms.remove(process->waiting_synchro); comm->cancel(); - // Remove first occurrence of &process->simcall: - auto i = boost::range::find( - process->waiting_synchro->simcalls, - &process->simcall); + auto i = boost::range::find(process->waiting_synchro->simcalls, &process->simcall); if (i != process->waiting_synchro->simcalls.end()) process->waiting_synchro->simcalls.remove(&process->simcall); - comm->unref(); - } else if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); } else if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); - delete process->waiting_synchro; + process->waiting_synchro->unref(); } else if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); @@ -475,7 +467,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { process->waiting_synchro = nullptr; } - if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) { + if (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) { XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); } @@ -497,32 +489,37 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const /* cancel the blocking synchro if any */ if (process->waiting_synchro) { - simgrid::kernel::activity::Exec *exec = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { SIMIX_execution_cancel(process->waiting_synchro); } - simgrid::kernel::activity::Comm *comm = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(process->waiting_synchro); if (comm != nullptr) { - xbt_fifo_remove(process->comms, comm); + process->comms.remove(comm); comm->cancel(); } - simgrid::kernel::activity::Sleep *sleep = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(process->waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); - if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { + if (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); } } - simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::RawImplPtr raw = + boost::dynamic_pointer_cast(process->waiting_synchro); if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); } - simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::IoImplPtr io = + boost::dynamic_pointer_cast(process->waiting_synchro); if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); } @@ -556,12 +553,13 @@ void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_actor_t process { process->new_host = dest; } + 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); } @@ -605,12 +603,13 @@ void SIMIX_process_resume(smx_actor_t process) { XBT_IN("process = %p", process); - if(process->context->iwannadie) { + if (process->context->iwannadie) { XBT_VERB("Ignoring request to suspend a process that is currently dying."); return; } - if(!process->suspended) return; + if (not process->suspended) + return; process->suspended = 0; /* resume the synchronization that was blocking the resumed process. */ @@ -641,10 +640,10 @@ void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); - if (!self) { + if (not self) { return nullptr; } - return SIMIX_process_get_data(self); + return self->data; } void SIMIX_process_self_set_data(void *data) @@ -654,11 +653,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; @@ -706,13 +700,14 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do simcall->issuer->waiting_synchro = sync; } -static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activity_t synchro){ - simgrid::kernel::activity::Sleep *sleep = static_cast(synchro); +static int SIMIX_process_join_finish(smx_process_exit_status_t status, void* synchro) +{ + simgrid::kernel::activity::SleepImpl* sleep = static_cast(synchro); if (sleep->surf_sleep) { sleep->surf_sleep->cancel(); - while (!sleep->simcalls.empty()) { + while (not sleep->simcalls.empty()) { smx_simcall_t simcall = sleep->simcalls.front(); sleep->simcalls.pop_front(); simcall_process_sleep__set__result(simcall, SIMIX_DONE); @@ -729,14 +724,21 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activ sleep->surf_sleep = nullptr; } sleep->unref(); + // intrusive_ptr_release(process); // FIXME: We are leaking here. See comment in SIMIX_process_join() return 0; } smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout) { smx_activity_t res = SIMIX_process_sleep(issuer, timeout); - static_cast(res)->ref(); - SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res); + (&*res)->ref(); + /* We are leaking the process here, but if we don't take the ref, we get a "use after free". + * The correct solution would be to derivate the type SynchroSleep into a SynchroProcessJoin, + * but the code is not clean enough for now for this. + * The C API should first be properly replaced with the C++ one, which is a fair amount of work. + */ + intrusive_ptr_add_ref(process); + SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, &*res); return res; } @@ -760,9 +762,9 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) if (host->isOff()) THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->cname()); - simgrid::kernel::activity::Sleep *synchro = new simgrid::kernel::activity::Sleep(); + simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); synchro->host = host; - synchro->surf_sleep = host->pimpl_cpu->sleep(duration); + synchro->surf_sleep = host->pimpl_cpu->sleep(duration); synchro->surf_sleep->setData(synchro); XBT_DEBUG("Create sleep synchronization %p", synchro); @@ -772,7 +774,8 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) void SIMIX_process_sleep_destroy(smx_activity_t synchro) { XBT_DEBUG("Destroy synchro %p", synchro); - simgrid::kernel::activity::Sleep *sleep = static_cast(synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(synchro); if (sleep->surf_sleep) { sleep->surf_sleep->unref(); @@ -866,7 +869,7 @@ xbt_dynar_t SIMIX_process_get_runnable() /** * \brief Returns the process from PID. */ -smx_actor_t SIMIX_process_from_PID(int PID) +smx_actor_t SIMIX_process_from_PID(aid_t PID) { if (simix_global->process_list.find(PID) == simix_global->process_list.end()) return nullptr; @@ -886,22 +889,19 @@ xbt_dynar_t SIMIX_processes_as_dynar() { void SIMIX_process_on_exit_runall(smx_actor_t process) { s_smx_process_exit_fun_t exit_fun; smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; - while (!xbt_dynar_is_empty(process->on_exit)) { - exit_fun = xbt_dynar_pop_as(process->on_exit,s_smx_process_exit_fun_t); + while (not process->on_exit.empty()) { + exit_fun = process->on_exit.back(); (exit_fun.fun)((void*)exit_status, exit_fun.arg); + process->on_exit.pop_back(); } } void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data) { xbt_assert(process, "current process not found: are you in maestro context ?"); - if (!process->on_exit) { - process->on_exit = xbt_dynar_new(sizeof(s_smx_process_exit_fun_t), nullptr); - } - s_smx_process_exit_fun_t exit_fun = {fun, data}; - xbt_dynar_push_as(process->on_exit,s_smx_process_exit_fun_t,exit_fun); + process->on_exit.push_back(exit_fun); } /** @@ -935,8 +935,14 @@ 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, 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; } void SIMIX_segment_index_set(smx_actor_t proc, int index){ @@ -960,14 +966,8 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){ * \param properties the properties of the process * \param auto_restart either it is autorestarting or not. */ -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) +smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, + char** argv, xbt_dict_t properties) { if (name == nullptr) name = ""; @@ -975,21 +975,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); 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) { 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, self] { + return SIMIX_process_create(name, std::move(code), data, host, properties, self); }); }