X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e631fc4ebfccaf24508e14216a9138669a635c6a..23f5bf52cc58cf837840f231cf638e9fcd45097b:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index b3e2a37163..ad38a717cc 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -146,7 +146,9 @@ void SIMIX_create_maestro_process() } /** * \brief Stops a process. - * Stops the process, execute all the registered on_exit functions + * + * 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_process_t arg) { @@ -162,6 +164,7 @@ void SIMIX_process_stop(smx_process_t arg) { arg->argc,arg->argv,arg->properties, arg->auto_restart); } + XBT_DEBUG("Process %s (%s) is dead",arg->name,arg->smx_host->name); /* stop the context */ SIMIX_context_stop(arg->context); } @@ -221,7 +224,6 @@ void SIMIX_process_create(smx_process_t *process, *process = xbt_new0(s_smx_process_t, 1); xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters"); - /* Process data */ (*process)->pid = simix_process_maxpid++; (*process)->name = xbt_strdup(name); @@ -293,8 +295,9 @@ void SIMIX_process_runall(void) * or directly for SIMIX internal purposes. * * \param process poor victim + * \param issuer the process which has sent the PROCESS_KILL. Important to not schedule twice the same process. */ -void SIMIX_process_kill(smx_process_t process) { +void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { XBT_DEBUG("Killing process %s on %s", process->name, process->smx_host->name); @@ -315,7 +318,7 @@ void SIMIX_process_kill(smx_process_t process) { case SIMIX_ACTION_COMMUNICATE: xbt_fifo_remove(process->comms, process->waiting_action); - SIMIX_comm_destroy(process->waiting_action); + SIMIX_comm_cancel(process->waiting_action); break; case SIMIX_ACTION_SLEEP: @@ -330,10 +333,20 @@ void SIMIX_process_kill(smx_process_t process) { case SIMIX_ACTION_IO: SIMIX_io_destroy(process->waiting_action); break; + + /* **************************************/ + /* TUTORIAL: New API */ + case SIMIX_ACTION_NEW_API: + SIMIX_new_api_destroy(process->waiting_action); + break; + /* **************************************/ + } } - if(!xbt_dynar_member(simix_global->process_to_run, &(process))) + if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) { xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process); + } + } /** @@ -346,7 +359,7 @@ void SIMIX_process_killall(smx_process_t issuer) while ((p = xbt_swag_extract(simix_global->process_list))) { if (p != issuer) { - SIMIX_process_kill(p); + SIMIX_process_kill(p,issuer); } } @@ -566,7 +579,7 @@ xbt_dict_t SIMIX_process_get_properties(smx_process_t process) void SIMIX_pre_process_sleep(smx_simcall_t simcall) { - if (MC_IS_ENABLED) { + if (MC_is_active()) { MC_process_clock_add(simcall->issuer, simcall->process_sleep.duration); simcall->process_sleep.result = SIMIX_DONE; SIMIX_simcall_answer(simcall); @@ -696,6 +709,13 @@ void SIMIX_process_yield(smx_process_t self) self->doexception = 0; SMX_THROW(); } + + /* Ignore some local variables from xbt/ex.c for stacks comparison */ + if(MC_is_active()){ + MC_ignore_stack("ctx", "SIMIX_process_yield"); + MC_ignore_stack("_throw_ctx", "SIMIX_process_yield"); + MC_ignore_stack("_log_ev", "SIMIX_process_yield"); + } } /* callback: context fetching */ @@ -708,7 +728,7 @@ xbt_running_ctx_t *SIMIX_process_get_running_context(void) void SIMIX_process_exception_terminate(xbt_ex_t * e) { xbt_ex_display(e); - abort(); + xbt_abort(); } smx_context_t SIMIX_process_get_context(smx_process_t p) { @@ -777,3 +797,56 @@ void SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data) void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart) { process->auto_restart = auto_restart; } +/** + * \brief Restart a process. + * Restart a process, starting it again from the beginning. + */ +smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) { + XBT_DEBUG("Restarting process %s on %s", process->name, process->smx_host->name); + //retrieve the arguments of the old process + //FIXME: Factorise this with SIMIX_host_add_auto_restart_process ? + s_smx_process_arg_t arg; + arg.code = process->code; + arg.hostname = process->smx_host->name; + arg.kill_time = process->kill_time; + arg.argc = process->argc; + arg.data = process->data; + int i; + arg.argv = xbt_new(char*,process->argc + 1); + for (i = 0; i < arg.argc; i++) { + arg.argv[i] = xbt_strdup(process->argv[i]); + } + arg.argv[process->argc] = NULL; + arg.properties = NULL; + arg.auto_restart = process->auto_restart; + //kill the old process + SIMIX_process_kill(process,issuer); + //start the new process + smx_process_t new_process; + if (simix_global->create_process_function) { + simix_global->create_process_function(&new_process, + arg.argv[0], + arg.code, + arg.data, + arg.hostname, + arg.kill_time, + arg.argc, + arg.argv, + arg.properties, + arg.auto_restart); + } + else { + simcall_process_create(&new_process, + arg.argv[0], + arg.code, + arg.data, + arg.hostname, + arg.kill_time, + arg.argc, + arg.argv, + arg.properties, + arg.auto_restart); + + } + return new_process; +}