X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48404c66fc4d8248308db1d1398cb79a6763077e..8985a1134de89a845dd5fb959c9a1fe776b890bf:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 6172807a78..bc5c0871a0 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012. The SimGrid Team. +/* Copyright (c) 2007-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -95,7 +95,6 @@ void SIMIX_process_cleanup(smx_process_t process) } } - /*xbt_swag_remove(process, simix_global->process_to_run);*/ xbt_swag_remove(process, simix_global->process_list); xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list); xbt_swag_insert(process, simix_global->process_to_destroy); @@ -123,8 +122,8 @@ void SIMIX_process_empty_trash(void) xbt_dynar_free(&process->on_exit); - free(process->name); - free(process); + xbt_free(process->name); + xbt_free(process); } } @@ -144,6 +143,12 @@ void SIMIX_create_maestro_process() maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro); maestro->simcall.issuer = maestro; + if (SIMIX_process_self()) { + maestro->ppid = SIMIX_process_get_PID(SIMIX_process_self()); + } else { + maestro->ppid = -1; + } + simix_global->maestro_process = maestro; return; } @@ -234,8 +239,12 @@ void SIMIX_process_create(smx_process_t *process, XBT_DEBUG("Start process %s on host '%s'", name, hostname); if (!SIMIX_host_get_state(host)) { + int i; XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname); + for (i = 0; i < argc; i++) + xbt_free(argv[i]); + xbt_free(argv); } else { *process = xbt_new0(s_smx_process_t, 1); @@ -249,6 +258,12 @@ void SIMIX_process_create(smx_process_t *process, (*process)->comms = xbt_fifo_new(); (*process)->simcall.issuer = *process; + if (SIMIX_process_self()) { + (*process)->ppid = SIMIX_process_get_PID(SIMIX_process_self()); + } else { + (*process)->ppid = -1; + } + /* Process data for auto-restart */ (*process)->auto_restart = auto_restart; (*process)->code = code; @@ -264,6 +279,10 @@ void SIMIX_process_create(smx_process_t *process, (*process)->running_ctx = xbt_new(xbt_running_ctx_t, 1); XBT_RUNNING_CTX_INITIALIZE((*process)->running_ctx); + if(MC_is_active()){ + MC_ignore_heap((*process)->running_ctx, sizeof(*(*process)->running_ctx)); + } + /* Add properties */ (*process)->properties = properties; @@ -332,35 +351,36 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { switch (process->waiting_action->type) { - case SIMIX_ACTION_EXECUTE: - case SIMIX_ACTION_PARALLEL_EXECUTE: - SIMIX_host_execution_destroy(process->waiting_action); - break; - - case SIMIX_ACTION_COMMUNICATE: - xbt_fifo_remove(process->comms, 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_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_EXECUTE: + case SIMIX_ACTION_PARALLEL_EXECUTE: + SIMIX_host_execution_destroy(process->waiting_action); + break; + + case SIMIX_ACTION_COMMUNICATE: + xbt_fifo_remove(process->comms, process->waiting_action); + SIMIX_comm_cancel(process->waiting_action); + SIMIX_comm_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_IO: + SIMIX_io_destroy(process->waiting_action); + break; + + /* **************************************/ + /* TUTORIAL: New API */ + case SIMIX_ACTION_NEW_API: + SIMIX_new_api_destroy(process->waiting_action); + break; + /* **************************************/ } } @@ -370,14 +390,14 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) { } -void SIMIX_pre_process_killall(smx_simcall_t simcall) { - SIMIX_process_killall(simcall->issuer); +void SIMIX_pre_process_killall(smx_simcall_t simcall, int reset_pid) { + SIMIX_process_killall(simcall->issuer, reset_pid); } /** * \brief Kills all running processes. * \param issuer this one will not be killed */ -void SIMIX_process_killall(smx_process_t issuer) +void SIMIX_process_killall(smx_process_t issuer, int reset_pid) { smx_process_t p = NULL; @@ -387,6 +407,9 @@ void SIMIX_process_killall(smx_process_t issuer) } } + if (reset_pid > 0) + simix_process_maxpid = reset_pid; + SIMIX_context_runall(); SIMIX_process_empty_trash(); @@ -538,6 +561,28 @@ int SIMIX_process_count(void) return xbt_swag_size(simix_global->process_list); } +int SIMIX_pre_process_get_PID(smx_simcall_t simcall, smx_process_t self){ + return SIMIX_process_get_PID(self); +} + +int SIMIX_process_get_PID(smx_process_t self){ + if (self == NULL) + return 0; + else + return self->pid; +} + +int SIMIX_pre_process_get_PPID(smx_simcall_t simcall, smx_process_t self){ + return SIMIX_process_get_PPID(self); +} + +int SIMIX_process_get_PPID(smx_process_t self){ + if (self == NULL) + return 0; + else + return self->ppid; +} + void* SIMIX_pre_process_self_get_data(smx_simcall_t simcall, smx_process_t self){ return SIMIX_process_self_get_data(self); } @@ -684,6 +729,7 @@ void SIMIX_post_process_sleep(smx_action_t action) case SURF_ACTION_FAILED: simcall->issuer->context->iwannadie = 1; //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); + state = SIMIX_SRC_HOST_FAILURE; break; case SURF_ACTION_DONE: