X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20801428bec07ed58c348d25ad39878f2c208389..88477504b135930a51dad5af1d57194c894c091b:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index dbef6463d2..fecde40403 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 @@ -38,6 +38,9 @@ int SIMIX_process_has_pending_comms(smx_process_t process) { return xbt_fifo_size(process->comms) > 0; } +void SIMIX_pre_process_cleanup(smx_simcall_t simcall, smx_process_t process) { + SIMIX_process_cleanup(process); +} /** * \brief Moves a process to the list of processes to destroy. */ @@ -144,9 +147,34 @@ void SIMIX_create_maestro_process() simix_global->maestro_process = maestro; return; } +/** + * \brief Stops a process. + * + * 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) { + /* execute the on_exit functions */ + SIMIX_process_on_exit_runall(arg); + /* Add the process to the list of process to restart, only if + * the host is down + */ + if (arg->auto_restart && !SIMIX_host_get_state(arg->smx_host)) { + SIMIX_host_add_auto_restart_process(arg->smx_host,arg->name,arg->code, arg->data, + arg->smx_host->name, + arg->kill_time, + 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); +} /** * \brief Same as SIMIX_process_create() but with only one argument (used by timers). + * This function frees the argument. * \return the process created */ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) { @@ -161,11 +189,26 @@ smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) { args->kill_time, args->argc, args->argv, - args->properties); - + args->properties, + args->auto_restart); + xbt_free(args); return process; } + +void SIMIX_pre_process_create(smx_simcall_t simcall, + smx_process_t *process, + const char *name, + xbt_main_func_t code, + void *data, + const char *hostname, + double kill_time, + int argc, char **argv, + xbt_dict_t properties, + int auto_restart){ + return SIMIX_process_create(process, name, code, data, hostname, + kill_time, argc, argv, properties, auto_restart); +} /** * \brief Internal function to create a process. * @@ -182,12 +225,13 @@ void SIMIX_process_create(smx_process_t *process, const char *hostname, double kill_time, int argc, char **argv, - xbt_dict_t properties) { + xbt_dict_t properties, + int auto_restart) { *process = NULL; smx_host_t host = SIMIX_host_get_by_name(hostname); - XBT_DEBUG("Start process %s on host %s", name, hostname); + XBT_DEBUG("Start process %s on host '%s'", name, hostname); if (!SIMIX_host_get_state(host)) { XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, @@ -197,7 +241,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); @@ -206,6 +249,17 @@ void SIMIX_process_create(smx_process_t *process, (*process)->comms = xbt_fifo_new(); (*process)->simcall.issuer = *process; + if(MC_is_active()) + MC_ignore_heap(&((*process)->simcall.result), sizeof((*process)->simcall.result)); + + /* Process data for auto-restart */ + (*process)->auto_restart = auto_restart; + (*process)->code = code; + (*process)->argc = argc; + (*process)->argv = argv; + (*process)->kill_time = kill_time; + + XBT_VERB("Create context %s", (*process)->name); (*process)->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, *process); @@ -255,6 +309,9 @@ void SIMIX_process_runall(void) xbt_dynar_reset(simix_global->process_to_run); } +void SIMIX_pre_process_kill(smx_simcall_t simcall, smx_process_t process) { + SIMIX_process_kill(process, simcall->issuer); +} /** * \brief Internal function to kill a SIMIX process. * @@ -262,8 +319,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); @@ -284,27 +342,40 @@ 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: - SIMIX_process_sleep_destroy(process->waiting_action); - break; + case SIMIX_ACTION_SLEEP: + SIMIX_process_sleep_destroy(process->waiting_action); + break; - case SIMIX_ACTION_SYNCHRO: - SIMIX_synchro_stop_waiting(process, &process->simcall); - SIMIX_synchro_destroy(process->waiting_action); - break; + case SIMIX_ACTION_SYNCHRO: + SIMIX_synchro_stop_waiting(process, &process->simcall); + SIMIX_synchro_destroy(process->waiting_action); + break; + + 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; + /* **************************************/ - case SIMIX_ACTION_IO: - SIMIX_io_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); + } + } +void SIMIX_pre_process_killall(smx_simcall_t simcall) { + SIMIX_process_killall(simcall->issuer); +} /** * \brief Kills all running processes. * \param issuer this one will not be killed @@ -315,7 +386,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); } } @@ -324,6 +395,11 @@ void SIMIX_process_killall(smx_process_t issuer) SIMIX_process_empty_trash(); } +void SIMIX_pre_process_change_host(smx_simcall_t simcall, smx_process_t process, + smx_host_t dest) +{ + process->new_host = dest; +} void SIMIX_process_change_host(smx_process_t process, smx_host_t dest) { @@ -333,14 +409,9 @@ void SIMIX_process_change_host(smx_process_t process, xbt_swag_insert(process, dest->process_list); } -void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest) -{ - process->new_host = dest; -} -void SIMIX_pre_process_suspend(smx_simcall_t simcall) +void SIMIX_pre_process_suspend(smx_simcall_t simcall, smx_process_t process) { - smx_process_t process = simcall->process_suspend.process; smx_action_t action_suspend = SIMIX_process_suspend(process, simcall->issuer); @@ -404,6 +475,10 @@ smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) } } +void SIMIX_pre_process_resume(smx_simcall_t simcall, smx_process_t process){ + SIMIX_process_resume(process, simcall->issuer); +} + void SIMIX_process_resume(smx_process_t process, smx_process_t issuer) { xbt_assert((process != NULL), "Invalid parameters"); @@ -458,11 +533,18 @@ int SIMIX_process_get_maxpid(void) { return simix_process_maxpid; } +int SIMIX_pre_process_count(smx_simcall_t simcall){ + return SIMIX_process_count(); +} int SIMIX_process_count(void) { return xbt_swag_size(simix_global->process_list); } +void* SIMIX_pre_process_self_get_data(smx_simcall_t simcall, smx_process_t self){ + return SIMIX_process_self_get_data(self); +} + void* SIMIX_process_self_get_data(smx_process_t self) { xbt_assert(self == SIMIX_process_self(), "This is not the current process"); @@ -473,6 +555,10 @@ void* SIMIX_process_self_get_data(smx_process_t self) return SIMIX_process_get_data(self); } +void SIMIX_pre_process_set_data(smx_simcall_t simcall, smx_process_t process, + void *data){ + SIMIX_process_set_data(process, data); +} void SIMIX_process_self_set_data(smx_process_t self, void *data) { xbt_assert(self == SIMIX_process_self(), "This is not the current process"); @@ -480,6 +566,9 @@ void SIMIX_process_self_set_data(smx_process_t self, void *data) SIMIX_process_set_data(self, data); } +void* SIMIX_pre_process_get_data(smx_simcall_t simcall, smx_process_t process){ + return SIMIX_process_get_data(process); +} void* SIMIX_process_get_data(smx_process_t process) { return process->data; @@ -490,6 +579,9 @@ void SIMIX_process_set_data(smx_process_t process, void *data) process->data = data; } +smx_host_t SIMIX_pre_process_get_host(smx_simcall_t simcall, smx_process_t process){ + return SIMIX_process_get_host(process); +} smx_host_t SIMIX_process_get_host(smx_process_t process) { return process->smx_host; @@ -506,6 +598,9 @@ const char* SIMIX_process_self_get_name(void) { return SIMIX_process_get_name(process); } +const char* SIMIX_pre_process_get_name(smx_simcall_t simcall, smx_process_t process) { + return SIMIX_process_get_name(process); +} const char* SIMIX_process_get_name(smx_process_t process) { return process->name; @@ -523,25 +618,31 @@ smx_process_t SIMIX_process_get_by_name(const char* name) return NULL; } +int SIMIX_pre_process_is_suspended(smx_simcall_t simcall, smx_process_t process){ + return SIMIX_process_is_suspended(process); +} int SIMIX_process_is_suspended(smx_process_t process) { return process->suspended; } +xbt_dict_t SIMIX_pre_process_get_properties(smx_simcall_t simcall, smx_process_t process){ + return SIMIX_process_get_properties(process); +} xbt_dict_t SIMIX_process_get_properties(smx_process_t process) { return process->properties; } -void SIMIX_pre_process_sleep(smx_simcall_t simcall) +void SIMIX_pre_process_sleep(smx_simcall_t simcall, double duration) { - if (MC_IS_ENABLED) { - MC_process_clock_add(simcall->issuer, simcall->process_sleep.duration); - simcall->process_sleep.result = SIMIX_DONE; + if (MC_is_active()) { + MC_process_clock_add(simcall->issuer, duration); + simcall_process_sleep__set__result(simcall, SIMIX_DONE); SIMIX_simcall_answer(simcall); return; } - smx_action_t action = SIMIX_process_sleep(simcall->issuer, simcall->process_sleep.duration); + smx_action_t action = SIMIX_process_sleep(simcall->issuer, duration); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; } @@ -600,7 +701,7 @@ void SIMIX_post_process_sleep(smx_action_t action) workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; } - simcall->process_sleep.result = state; + simcall_process_sleep__set__result(simcall, state); simcall->issuer->waiting_action = NULL; SIMIX_simcall_answer(simcall); @@ -651,7 +752,7 @@ void SIMIX_process_yield(smx_process_t self) if (self->context->iwannadie){ XBT_DEBUG("I wanna die!"); - SIMIX_context_stop(self->context); + SIMIX_process_stop(self); } if(self->suspended) { @@ -665,6 +766,7 @@ void SIMIX_process_yield(smx_process_t self) self->doexception = 0; SMX_THROW(); } + } /* callback: context fetching */ @@ -677,7 +779,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) { @@ -719,6 +821,8 @@ xbt_dynar_t SIMIX_processes_as_dynar(void) { } return res; } + + void SIMIX_process_on_exit_runall(smx_process_t process) { s_smx_process_exit_fun_t exit_fun; @@ -727,6 +831,12 @@ void SIMIX_process_on_exit_runall(smx_process_t process) { (exit_fun.fun)(exit_fun.arg); } } + +void SIMIX_pre_process_on_exit(smx_simcall_t simcall, smx_process_t process, + int_f_pvoid_t fun, void *data) { + SIMIX_process_on_exit(process, fun, data); +} + void SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data) { xbt_assert(process, "current process not found: are you in maestro context ?"); @@ -738,3 +848,73 @@ void SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data) xbt_dynar_push_as(process->on_exit,s_smx_process_exit_fun_t,exit_fun); } + +void SIMIX_pre_process_auto_restart_set(smx_simcall_t simcall, smx_process_t process, + int auto_restart) { + SIMIX_process_auto_restart_set(process, auto_restart); +} +/** + * \brief Sets the auto-restart status of the process. + * If set to 1, the process will be automatically restarted when its host + * comes back. + */ +void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart) { + process->auto_restart = auto_restart; +} + +smx_process_t SIMIX_pre_process_restart(smx_simcall_t simcall, smx_process_t process) { + return SIMIX_process_restart(process, simcall->issuer); +} +/** + * \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; +}