X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e258a57d13489d4cf1dd7329364fd474b053487f..15badc71ce964f6dae6428c9a4c0198fad5d4936:/src/simix/smx_host.c diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index ccfc54ec98..cf11967d1a 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.c @@ -38,6 +38,88 @@ smx_host_t SIMIX_host_create(const char *name, return xbt_lib_get_elm_or_null(host_lib, name); } +void SIMIX_pre_host_on(smx_simcall_t simcall, smx_host_t h) +{ + SIMIX_host_on(h); +} + +/** + * \brief Start the host if it is off + * + */ +void SIMIX_host_on(smx_host_t h) +{ + smx_host_priv_t host = SIMIX_host_priv(h); + + xbt_assert((host != NULL), "Invalid parameters"); + + surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL); + if (ws_model->extension.workstation.get_state(h)==SURF_RESOURCE_OFF) { + ws_model->extension.workstation.set_state(h, SURF_RESOURCE_ON); + unsigned int cpt; + smx_process_arg_t arg; + xbt_dynar_foreach(host->boot_processes,cpt,arg) { + smx_process_t process; + + XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname); + if (simix_global->create_process_function) { + simix_global->create_process_function(&process, + arg->argv[0], + arg->code, + NULL, + arg->hostname, + arg->kill_time, + arg->argc, + arg->argv, + arg->properties, + arg->auto_restart); + } + else { + simcall_process_create(&process, + arg->argv[0], + arg->code, + NULL, + arg->hostname, + arg->kill_time, + arg->argc, + arg->argv, + arg->properties, + arg->auto_restart); + } + } + } +} + +void SIMIX_pre_host_off(smx_simcall_t simcall, smx_host_t h) +{ + SIMIX_host_off(h, simcall->issuer); +} + +/** + * \brief Stop the host if it is on + * + */ +void SIMIX_host_off(smx_host_t h, smx_process_t issuer) +{ + smx_host_priv_t host = SIMIX_host_priv(h); + + xbt_assert((host != NULL), "Invalid parameters"); + + surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL); + if (ws_model->extension.workstation.get_state(h)==SURF_RESOURCE_ON) { + ws_model->extension.workstation.set_state(h, SURF_RESOURCE_OFF); + + /* Clean Simulator data */ + if (xbt_swag_size(host->process_list) != 0) { + smx_process_t process = NULL; + xbt_swag_foreach(process, host->process_list) { + SIMIX_process_kill(process, issuer); + XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_name(process->smx_host), issuer->name); + } + } + } +} + /** * \brief Internal function to destroy a SIMIX host. * @@ -51,8 +133,7 @@ void SIMIX_host_destroy(void *h) /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { - char *msg = - bprintf("Shutting down host, but it's not empty:"); + char *msg = xbt_strdup("Shutting down host, but it's not empty:"); char *tmp; smx_process_t process = NULL; @@ -65,6 +146,7 @@ void SIMIX_host_destroy(void *h) THROWF(arg_error, 0, "%s", msg); } xbt_dynar_free(&host->auto_restart_processes); + xbt_dynar_free(&host->boot_processes); xbt_swag_free(host->process_list); /* Clean host structure */ @@ -150,6 +232,18 @@ double SIMIX_host_get_speed(smx_host_t host){ return ws_model->extension.workstation.get_speed(host, 1.0); } +int SIMIX_pre_host_get_core(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_core(host); +} +int SIMIX_host_get_core(smx_host_t host){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + return surf_workstation_model->extension.workstation. + get_core(host); +} + + + double SIMIX_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){ return SIMIX_host_get_available_speed(host); } @@ -193,7 +287,7 @@ void* SIMIX_host_get_data(smx_host_t host){ return SIMIX_host_priv(host)->data; } -void _SIMIX_host_free_process_arg(void *); + void _SIMIX_host_free_process_arg(void *data) { smx_process_arg_t arg = *(void**)data; @@ -306,11 +400,11 @@ void SIMIX_host_set_data(smx_host_t host, void *data){ } smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name, - smx_host_t host, double computation_amount, double priority){ - return SIMIX_host_execute(name, host, computation_amount, priority); + smx_host_t host, double computation_amount, double priority, double bound){ + return SIMIX_host_execute(name, host, computation_amount, priority, bound); } smx_action_t SIMIX_host_execute(const char *name, - smx_host_t host, double computation_amount, double priority){ + smx_host_t host, double computation_amount, double priority, double bound){ /* alloc structures and initialize */ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator); @@ -329,6 +423,7 @@ smx_action_t SIMIX_host_execute(const char *name, action->execution.surf_exec = ws_model->extension.workstation.execute(host, computation_amount); ws_model->action_data_set(action->execution.surf_exec, action); ws_model->set_priority(action->execution.surf_exec, priority); + ws_model->set_bound(action->execution.surf_exec, bound); } XBT_DEBUG("Create execute action %p", action); @@ -455,7 +550,7 @@ e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action){ void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action, double priority){ - return SIMIX_host_execution_set_priority(action, priority); + SIMIX_host_execution_set_priority(action, priority); } void SIMIX_host_execution_set_priority(smx_action_t action, double priority){ surf_model_t ws_model = get_ws_model_from_action(action); @@ -464,6 +559,17 @@ void SIMIX_host_execution_set_priority(smx_action_t action, double priority){ ws_model->set_priority(action->execution.surf_exec, priority); } +void SIMIX_pre_host_execution_set_bound(smx_simcall_t simcall, smx_action_t action, + double bound){ + SIMIX_host_execution_set_bound(action, bound); +} +void SIMIX_host_execution_set_bound(smx_action_t action, double bound){ + surf_model_t ws_model = get_ws_model_from_action(action); + + if(action->execution.surf_exec) + ws_model->set_bound(action->execution.surf_exec, bound); +} + void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){ XBT_DEBUG("Wait for execution of action %p, state %d", action, (int)action->state); @@ -547,13 +653,15 @@ void SIMIX_execution_finish(smx_action_t action) void SIMIX_post_host_execute(smx_action_t action) { + surf_model_t ws_model = get_ws_model_from_action(action); + if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure * for parallel tasks too */ - surf_workstation_model->extension.workstation.get_state(action->execution.host) == SURF_RESOURCE_OFF) { + ws_model->extension.workstation.get_state(action->execution.host) == SURF_RESOURCE_OFF) { /* If the host running the action failed, notice it so that the asking * process can be killed if it runs on that host itself */ action->state = SIMIX_FAILED; - } else if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) { + } else if (ws_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) { /* If the host running the action didn't fail, then the action was * canceled */ action->state = SIMIX_CANCELED; @@ -562,7 +670,7 @@ void SIMIX_post_host_execute(smx_action_t action) } if (action->execution.surf_exec) { - surf_workstation_model->action_unref(action->execution.surf_exec); + ws_model->action_unref(action->execution.surf_exec); action->execution.surf_exec = NULL; } @@ -591,3 +699,33 @@ void SIMIX_set_category(smx_action_t action, const char *category) } #endif + +/** + * \brief Function to get the parameters of the given the SIMIX host. + * + * \param host the host to get_phys_host (a smx_host_t) + * \param param the parameter object space to be overwritten (a ws_params_t) + */ +void SIMIX_host_get_params(smx_host_t ind_vm, ws_params_t params) +{ + /* jump to ws_get_params(). */ + surf_workstation_model->extension.workstation.get_params(ind_vm, params); +} + +void SIMIX_pre_host_get_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params) +{ + SIMIX_host_get_params(ind_vm, params); + SIMIX_simcall_answer(simcall); +} + +void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params) +{ + /* jump to ws_set_params(). */ + surf_workstation_model->extension.workstation.set_params(ind_vm, params); +} + +void SIMIX_pre_host_set_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params) +{ + SIMIX_host_set_params(ind_vm, params); + SIMIX_simcall_answer(simcall); +}