X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/152117af2fbcf4c99d0da5d10a6813aac7eee007..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/simix/smx_host.c diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index f22b289b72..5b4206233f 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.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 @@ -34,8 +34,88 @@ smx_host_t SIMIX_host_create(const char *name, /* Update global variables */ xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host); + + return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL); +} + +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"); + + if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_OFF) { + surf_resource_set_state(surf_workstation_resource_priv(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"); - return xbt_lib_get_elm_or_null(host_lib, name); + if (surf_resource_get_state(surf_workstation_resource_priv(h))==SURF_RESOURCE_OFF) { + surf_resource_set_state(surf_workstation_resource_priv(h), SURF_RESOURCE_ON); + + /* 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); + } + } + } } /** @@ -64,6 +144,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 */ @@ -135,7 +216,7 @@ xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t simcall, smx_host_t host) xbt_dict_t SIMIX_host_get_properties(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation.get_properties(host); + return surf_resource_get_properties(surf_workstation_resource_priv(host)); } double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){ @@ -143,19 +224,37 @@ double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){ } double SIMIX_host_get_speed(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + return surf_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_get_core(host); +} + +xbt_swag_t SIMIX_pre_host_get_process_list(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_process_list(host); +} + +xbt_swag_t SIMIX_host_get_process_list(smx_host_t host){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + smx_host_priv_t host_priv = SIMIX_host_priv(host); - return surf_workstation_model->extension.workstation. - get_speed(host, 1.0); + return host_priv->process_list; } + double SIMIX_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){ return SIMIX_host_get_available_speed(host); } double SIMIX_host_get_available_speed(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_available_speed(host); + return surf_workstation_get_available_speed(host); } double SIMIX_pre_host_get_current_power_peak(smx_simcall_t simcall, smx_host_t host){ @@ -163,8 +262,7 @@ double SIMIX_pre_host_get_current_power_peak(smx_simcall_t simcall, smx_host_t h } double SIMIX_host_get_current_power_peak(smx_host_t host) { xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_current_power_peak(host); + return surf_workstation_get_current_power_peak(host); } double SIMIX_pre_host_get_power_peak_at(smx_simcall_t simcall, smx_host_t host, int pstate_index){ @@ -173,8 +271,7 @@ double SIMIX_pre_host_get_power_peak_at(smx_simcall_t simcall, smx_host_t host, double SIMIX_host_get_power_peak_at(smx_host_t host, int pstate_index) { xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_power_peak_at(host, pstate_index); + return surf_workstation_get_power_peak_at(host, pstate_index); } int SIMIX_pre_host_get_nb_pstates(smx_simcall_t simcall, smx_host_t host){ @@ -183,8 +280,7 @@ int SIMIX_pre_host_get_nb_pstates(smx_simcall_t simcall, smx_host_t host){ int SIMIX_host_get_nb_pstates(smx_host_t host) { xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_nb_pstates(host); + return surf_workstation_get_nb_pstates(host); } @@ -194,8 +290,7 @@ void SIMIX_pre_host_set_power_peak_at(smx_simcall_t simcall, smx_host_t host, in void SIMIX_host_set_power_peak_at(smx_host_t host, int pstate_index) { xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - surf_workstation_model->extension.workstation. - set_power_peak_at(host, pstate_index); + surf_workstation_set_power_peak_at(host, pstate_index); } double SIMIX_pre_host_get_consumed_energy(smx_simcall_t simcall, smx_host_t host){ @@ -203,8 +298,7 @@ double SIMIX_pre_host_get_consumed_energy(smx_simcall_t simcall, smx_host_t host } double SIMIX_host_get_consumed_energy(smx_host_t host) { xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_consumed_energy(host); + return surf_workstation_get_consumed_energy(host); } int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){ @@ -213,8 +307,7 @@ int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){ int SIMIX_host_get_state(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_state(host); + return surf_resource_get_state(surf_workstation_resource_priv(host)); } void* SIMIX_pre_host_self_get_data(smx_simcall_t simcall){ @@ -240,10 +333,14 @@ 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; + int i; + for (i = 0; i < arg->argc; i++) + xbt_free(arg->argv[i]); + xbt_free(arg->argv); xbt_free(arg->name); xbt_free(arg); } @@ -289,7 +386,7 @@ void SIMIX_host_add_auto_restart_process(smx_host_t host, if( SIMIX_host_get_state(host) == SURF_RESOURCE_OFF && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_name(host))){ xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL); - XBT_DEBUG("Have push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host)); + XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host)); } xbt_dynar_push_as(SIMIX_host_priv(host)->auto_restart_processes,smx_process_arg_t,arg); } @@ -300,7 +397,11 @@ void SIMIX_host_restart_processes(smx_host_t host) { unsigned int cpt; smx_process_arg_t arg; - xbt_dynar_foreach(SIMIX_host_priv(host)->auto_restart_processes,cpt,arg) { + xbt_dynar_t process_list = SIMIX_host_priv(host)->auto_restart_processes; + if (!process_list) + return; + + xbt_dynar_foreach (process_list, cpt, arg) { smx_process_t process; @@ -316,22 +417,26 @@ void SIMIX_host_restart_processes(smx_host_t host) arg->argv, arg->properties, arg->auto_restart); - } - else { + } 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); + arg->argv[0], + arg->code, + NULL, + arg->hostname, + arg->kill_time, + arg->argc, + arg->argv, + arg->properties, + arg->auto_restart); } + /* arg->argv is used by the process created above. Hide it to + * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset() + * below. */ + arg->argc = 0; + arg->argv = NULL; } - xbt_dynar_reset(SIMIX_host_priv(host)->auto_restart_processes); + xbt_dynar_reset(process_list); } void SIMIX_host_autorestart(smx_host_t host) @@ -353,11 +458,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, unsigned long affinity_mask){ + return SIMIX_host_execute(name, host, computation_amount, priority, bound, affinity_mask); } 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, unsigned long affinity_mask){ /* alloc structures and initialize */ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator); @@ -372,11 +477,24 @@ smx_action_t SIMIX_host_execute(const char *name, /* set surf's action */ if (!MC_is_active()) { - action->execution.surf_exec = - surf_workstation_model->extension.workstation.execute(host, - computation_amount); - surf_workstation_model->action_data_set(action->execution.surf_exec, action); - surf_workstation_model->set_priority(action->execution.surf_exec, priority); + + action->execution.surf_exec = surf_workstation_execute(host, computation_amount); + surf_action_set_data(action->execution.surf_exec, action); + surf_action_set_priority(action->execution.surf_exec, priority); + + /* Note (hypervisor): for multicore, the bound value being passed to the + * surf layer should not be zero (i.e., unlimited). It should be the + * capacity of a CPU core. */ + if (bound == 0) + surf_cpu_action_set_bound(action->execution.surf_exec, SIMIX_host_get_speed(host)); + else + surf_cpu_action_set_bound(action->execution.surf_exec, bound); + + if (affinity_mask != 0) { + /* just a double check to confirm that this host is the host where this task is running. */ + xbt_assert(action->execution.host == host); + surf_cpu_action_set_affinity(action->execution.surf_exec, host, affinity_mask); + } } XBT_DEBUG("Create execute action %p", action); @@ -413,22 +531,43 @@ smx_action_t SIMIX_host_parallel_execute(const char *name, /* set surf's action */ workstation_list = xbt_new0(void *, host_nb); for (i = 0; i < host_nb; i++) - workstation_list[i] = host_list[i]; + workstation_list[i] = surf_workstation_resource_priv(host_list[i]); + + + /* FIXME: what happens if host_list contains VMs and PMs. If + * execute_parallel_task() does not change the state of the model, we can mix + * them. */ + surf_model_t ws_model = surf_resource_model(host_list[0], SURF_WKS_LEVEL); + for (i = 1; i < host_nb; i++) { + surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_WKS_LEVEL); + if (ws_model_tmp != ws_model) { + XBT_CRITICAL("mixing VMs and PMs is not supported"); + DIE_IMPOSSIBLE; + } + } /* set surf's action */ if (!MC_is_active()) { action->execution.surf_exec = - surf_workstation_model->extension.workstation. - execute_parallel_task(host_nb, workstation_list, computation_amount, - communication_amount, rate); + surf_workstation_model_execute_parallel_task((surf_workstation_model_t)surf_workstation_model, + host_nb, workstation_list, computation_amount, communication_amount, rate); - surf_workstation_model->action_data_set(action->execution.surf_exec, action); + surf_action_set_data(action->execution.surf_exec, action); } XBT_DEBUG("Create parallel execute action %p", action); return action; } +//FIXME: REMOVE not used +static surf_model_t get_ws_model_from_action(smx_action_t action) +{ + xbt_assert(action->type == SIMIX_ACTION_EXECUTE); + smx_host_t host = action->execution.host; + surf_model_t model = surf_resource_model(host, SURF_WKS_LEVEL); + return model; +} + void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){ SIMIX_host_execution_destroy(action); } @@ -436,7 +575,7 @@ void SIMIX_host_execution_destroy(smx_action_t action){ XBT_DEBUG("Destroy action %p", action); if (action->execution.surf_exec) { - surf_workstation_model->action_unref(action->execution.surf_exec); + surf_action_unref(action->execution.surf_exec); action->execution.surf_exec = NULL; } xbt_free(action->name); @@ -450,7 +589,7 @@ void SIMIX_host_execution_cancel(smx_action_t action){ XBT_DEBUG("Cancel action %p", action); if (action->execution.surf_exec) - surf_workstation_model->action_cancel(action->execution.surf_exec); + surf_action_cancel(action->execution.surf_exec); } double SIMIX_pre_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){ @@ -460,7 +599,7 @@ double SIMIX_host_execution_get_remains(smx_action_t action){ double result = 0.0; if (action->state == SIMIX_RUNNING) - result = surf_workstation_model->get_remains(action->execution.surf_exec); + result = surf_action_get_remains(action->execution.surf_exec); return result; } @@ -474,11 +613,36 @@ 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){ + + if(action->execution.surf_exec) + surf_action_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){ + if(action->execution.surf_exec) - surf_workstation_model->set_priority(action->execution.surf_exec, priority); + surf_cpu_action_set_bound(action->execution.surf_exec, bound); +} + +void SIMIX_pre_host_execution_set_affinity(smx_simcall_t simcall, + smx_action_t action, smx_host_t host, unsigned long mask){ + SIMIX_host_execution_set_affinity(action, host, mask); +} +void SIMIX_host_execution_set_affinity(smx_action_t action, smx_host_t host, unsigned long mask){ + xbt_assert(action->type == SIMIX_ACTION_EXECUTE); + + if (action->execution.surf_exec) { + /* just a double check to confirm that this host is the host where this task is running. */ + xbt_assert(action->execution.host == host); + surf_cpu_action_set_affinity(action->execution.surf_exec, host, mask); + } } void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){ @@ -504,13 +668,13 @@ void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){ void SIMIX_host_execution_suspend(smx_action_t action) { if(action->execution.surf_exec) - surf_workstation_model->suspend(action->execution.surf_exec); + surf_action_suspend(action->execution.surf_exec); } void SIMIX_host_execution_resume(smx_action_t action) { if(action->execution.surf_exec) - surf_workstation_model->resume(action->execution.surf_exec); + surf_action_resume(action->execution.surf_exec); } void SIMIX_execution_finish(smx_action_t action) @@ -530,7 +694,7 @@ void SIMIX_execution_finish(smx_action_t action) case SIMIX_FAILED: XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host)); simcall->issuer->context->iwannadie = 1; - //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); + SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; case SIMIX_CANCELED: @@ -543,8 +707,7 @@ void SIMIX_execution_finish(smx_action_t action) (int)action->state); } /* check if the host is down */ - 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; } @@ -557,15 +720,16 @@ void SIMIX_execution_finish(smx_action_t action) SIMIX_host_execution_destroy(action); } + void SIMIX_post_host_execute(smx_action_t 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) { + surf_resource_get_state(surf_workstation_resource_priv(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 (surf_action_get_state(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; @@ -574,7 +738,7 @@ void SIMIX_post_host_execute(smx_action_t action) } if (action->execution.surf_exec) { - surf_workstation_model->action_unref(action->execution.surf_exec); + surf_action_unref(action->execution.surf_exec); action->execution.surf_exec = NULL; } @@ -594,10 +758,47 @@ void SIMIX_set_category(smx_action_t action, const char *category) { if (action->state != SIMIX_RUNNING) return; if (action->type == SIMIX_ACTION_EXECUTE){ - surf_workstation_model->set_category(action->execution.surf_exec, category); + surf_action_set_category(action->execution.surf_exec, category); }else if (action->type == SIMIX_ACTION_COMMUNICATE){ - surf_workstation_model->set_category(action->comm.surf_comm, category); + surf_action_set_category(action->comm.surf_comm, 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_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); +} + +void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params) +{ + /* jump to ws_set_params(). */ + surf_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); +} + +xbt_dict_t SIMIX_pre_host_get_storage_list(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_storage_list(host); +} + +xbt_dict_t SIMIX_host_get_storage_list(smx_host_t host){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + return surf_workstation_get_storage_list(host); +}