X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e44b79c5c7acf75b2793fdd7ca7e604baf5da74..47fb968673db55fee5ab9b7d5dcf395fd47118f1:/src/simix/smx_process.c diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c index 4899f9174d..1444dc0119 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-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ XBT_INLINE smx_process_t SIMIX_process_self(void) { smx_context_t self_context = SIMIX_context_self(); - return self_context ? SIMIX_context_get_data(self_context) : NULL; + return self_context ? SIMIX_context_get_process(self_context) : NULL; } /** @@ -122,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); } } @@ -211,8 +211,9 @@ void SIMIX_pre_process_create(smx_simcall_t simcall, 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); + SIMIX_process_create_with_parent(process, name, code, data, hostname, + kill_time, argc, argv, properties, auto_restart, + simcall->issuer); } /** * \brief Internal function to create a process. @@ -232,15 +233,32 @@ void SIMIX_process_create(smx_process_t *process, int argc, char **argv, xbt_dict_t properties, int auto_restart) { - + SIMIX_process_create_with_parent(process, name, code, data, hostname, + kill_time, argc, argv, properties, auto_restart, NULL); +} + +void SIMIX_process_create_with_parent(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, + smx_process_t parent_process) { *process = NULL; smx_host_t host = SIMIX_host_get_by_name(hostname); 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); @@ -254,8 +272,8 @@ 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()); + if (parent_process) { + (*process)->ppid = SIMIX_process_get_PID(parent_process); } else { (*process)->ppid = -1; } @@ -487,7 +505,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, 0); } } @@ -691,8 +710,7 @@ smx_action_t SIMIX_process_sleep(smx_process_t process, double duration) smx_host_t host = process->smx_host; /* check if the host is active */ - if (surf_workstation_model->extension. - workstation.get_state(host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(host)) != SURF_RESOURCE_ON) { THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_name(host)); } @@ -706,9 +724,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, duration); + surf_workstation_sleep(host, duration); - surf_workstation_model->action_data_set(action->sleep.surf_sleep, action); + surf_action_set_data(action->sleep.surf_sleep, action); XBT_DEBUG("Create sleep action %p", action); return action; @@ -718,10 +736,12 @@ void SIMIX_post_process_sleep(smx_action_t action) { smx_simcall_t simcall; e_smx_state_t state; + smx_process_t issuer; + xbt_assert(action->type == SIMIX_ACTION_SLEEP); while ((simcall = xbt_fifo_shift(action->simcalls))) { - switch(surf_workstation_model->action_state_get(action->sleep.surf_sleep)){ + switch(surf_action_get_state(action->sleep.surf_sleep)){ case SURF_ACTION_FAILED: simcall->issuer->context->iwannadie = 1; //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); @@ -736,34 +756,41 @@ void SIMIX_post_process_sleep(smx_action_t action) THROW_IMPOSSIBLE; break; } - if (surf_workstation_model->extension. - workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) { + if (surf_resource_get_state(surf_workstation_resource_priv(simcall->issuer->smx_host)) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; } simcall_process_sleep__set__result(simcall, state); simcall->issuer->waiting_action = NULL; SIMIX_simcall_answer(simcall); + issuer = simcall->issuer; } + SIMIX_process_sleep_destroy(action); + if (issuer->suspended) + simcall_process_suspend(issuer); } 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); + surf_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); + surf_action_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); + surf_action_resume(action->sleep.surf_sleep); } /**