X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5ac33cf4580f8748f6f01c338896df9171fa4c9..dd22867177c86db2e9d0b76852cb09e044b1c0c8:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 434f87a531..aa7434acc8 100644 --- a/src/simix/smx_process.c +++ b/src/simix/smx_process.c @@ -95,9 +95,8 @@ 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, process->smx_host->process_list); + xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list); xbt_swag_insert(process, simix_global->process_to_destroy); process->context->iwannadie = 0; } @@ -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; } @@ -162,12 +167,12 @@ void SIMIX_process_stop(smx_process_t arg) { */ 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, + sg_host_name(arg->smx_host), 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); + XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_name(arg->smx_host)); /* stop the context */ SIMIX_context_stop(arg->context); } @@ -249,6 +254,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,24 +275,28 @@ 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; /* Add the process to it's host process list */ - xbt_swag_insert(*process, host->process_list); + xbt_swag_insert(*process, SIMIX_host_priv(host)->process_list); XBT_DEBUG("Start context '%s'", (*process)->name); /* Now insert it in the global process list and in the process to run list */ xbt_swag_insert(*process, simix_global->process_list); - XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, host->name); + XBT_DEBUG("Inserting %s(%s) in the to_run list", (*process)->name, sg_host_name(host)); xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, *process); } if (kill_time > SIMIX_get_clock()) { if (simix_global->kill_process_function) { XBT_DEBUG("Process %s(%s) will be kill at time %f", (*process)->name, - (*process)->smx_host->name, kill_time); + sg_host_name((*process)->smx_host), kill_time); SIMIX_timer_set(kill_time, simix_global->kill_process_function, *process); } } @@ -320,7 +335,7 @@ void SIMIX_pre_process_kill(smx_simcall_t simcall, 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); + XBT_DEBUG("Killing process %s on %s", process->name, sg_host_name(process->smx_host)); process->context->iwannadie = 1; process->blocked = 0; @@ -332,35 +347,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 +386,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 +403,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(); @@ -401,9 +420,9 @@ void SIMIX_process_change_host(smx_process_t process, smx_host_t dest) { xbt_assert((process != NULL), "Invalid parameters"); - xbt_swag_remove(process, process->smx_host->process_list); + xbt_swag_remove(process, SIMIX_host_priv(process->smx_host)->process_list); process->smx_host = dest; - xbt_swag_insert(process, dest->process_list); + xbt_swag_insert(process, SIMIX_host_priv(dest)->process_list); } @@ -468,7 +487,8 @@ smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer) return NULL; } } else { - return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0); + /* FIXME: computation size is zero. Is it okay that bound is zero ? */ + return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0, 0.0); } } @@ -538,6 +558,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); } @@ -648,12 +690,13 @@ smx_action_t SIMIX_process_sleep(smx_process_t process, double duration) { smx_action_t action; smx_host_t host = process->smx_host; + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host->host) != SURF_RESOURCE_ON) { + if (ws_model->extension. + workstation.get_state(host) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", - host->name); + sg_host_name(host)); } action = xbt_mallocator_get(simix_global->action_mallocator); @@ -665,9 +708,9 @@ smx_action_t SIMIX_process_sleep(smx_process_t process, double duration) action->sleep.host = host; action->sleep.surf_sleep = - surf_workstation_model->extension.workstation.sleep(host->host, duration); + ws_model->extension.workstation.sleep(host, duration); - surf_workstation_model->action_data_set(action->sleep.surf_sleep, action); + ws_model->action_data_set(action->sleep.surf_sleep, action); XBT_DEBUG("Create sleep action %p", action); return action; @@ -678,12 +721,17 @@ void SIMIX_post_process_sleep(smx_action_t action) smx_simcall_t simcall; e_smx_state_t state; + xbt_assert(action->type == SIMIX_ACTION_SLEEP); + smx_host_t host = action->sleep.host; + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + while ((simcall = xbt_fifo_shift(action->simcalls))) { - switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){ + switch(ws_model->action_state_get(action->sleep.surf_sleep)){ 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: @@ -694,8 +742,8 @@ void SIMIX_post_process_sleep(smx_action_t action) THROW_IMPOSSIBLE; break; } - if (surf_workstation_model->extension. - workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) { + if (ws_model->extension. + workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; } simcall_process_sleep__set__result(simcall, state); @@ -709,19 +757,30 @@ void SIMIX_post_process_sleep(smx_action_t action) void SIMIX_process_sleep_destroy(smx_action_t action) { XBT_DEBUG("Destroy action %p", action); + xbt_assert(action->type == SIMIX_ACTION_SLEEP); + if (action->sleep.surf_sleep) - action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep); + action->sleep.surf_sleep->model_obj->action_unref(action->sleep.surf_sleep); xbt_mallocator_release(simix_global->action_mallocator, action); } void SIMIX_process_sleep_suspend(smx_action_t action) { - surf_workstation_model->suspend(action->sleep.surf_sleep); + xbt_assert(action->type == SIMIX_ACTION_SLEEP); + smx_host_t host = action->sleep.host; + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + + ws_model->suspend(action->sleep.surf_sleep); } void SIMIX_process_sleep_resume(smx_action_t action) { - surf_workstation_model->resume(action->sleep.surf_sleep); + xbt_assert(action->type == SIMIX_ACTION_SLEEP); + smx_host_t host = action->sleep.host; + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + XBT_DEBUG("%p ws_model", ws_model); + + ws_model->resume(action->sleep.surf_sleep); } /** @@ -867,12 +926,12 @@ smx_process_t SIMIX_pre_process_restart(smx_simcall_t simcall, smx_process_t pro * 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); + XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_name(process->smx_host)); //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.hostname = sg_host_name(process->smx_host); arg.kill_time = process->kill_time; arg.argc = process->argc; arg.data = process->data;