X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..7bac600c529ba83f8f246a2dcfa9ddd9c0095675:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 57f1fac826..592a10156a 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -10,6 +10,8 @@ #include "xbt/dict.h" #include "mc/mc.h" #include "src/mc/mc_replay.h" +#include "src/surf/virtual_machine.hpp" +#include "src/surf/host_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -43,8 +45,9 @@ void SIMIX_host_on(sg_host_t h) xbt_assert((host != NULL), "Invalid parameters"); - if (h->isOff()) { - surf_host_turn_on(surf_host_resource_priv(h)); + if (h->is_off()) { + simgrid::surf::Host* surf_host = h->extension(); + surf_host->turnOn(); unsigned int cpt; smx_process_arg_t arg; @@ -81,11 +84,6 @@ void SIMIX_host_on(sg_host_t h) } } -void simcall_HANDLER_host_off(smx_simcall_t simcall, sg_host_t h) -{ - SIMIX_host_off(h, simcall->issuer); -} - /** * \brief Stop the host if it is on * @@ -96,8 +94,9 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer) xbt_assert((host != NULL), "Invalid parameters"); - if (h->isOn()) { - surf_host_turn_off(surf_host_resource_priv(h)); + if (h->is_on()) { + simgrid::surf::Host* surf_host = h->extension(); + surf_host->turnOff(); /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { @@ -108,7 +107,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer) } } } else { - XBT_INFO("Host %s is already off",h->getName().c_str()); + XBT_INFO("Host %s is already off",h->name().c_str()); } } @@ -160,37 +159,7 @@ const char* SIMIX_host_self_get_name(void) if (host == NULL || SIMIX_process_self() == simix_global->maestro_process) return ""; - return SIMIX_host_get_name(host); -} - -xbt_dict_t SIMIX_host_get_properties(sg_host_t host){ - return sg_host_get_properties(host); -} - - -xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){ - smx_host_priv_t host_priv = sg_host_simix(host); - - return host_priv->process_list; -} - - -double SIMIX_host_get_current_power_peak(sg_host_t host) { - return surf_host_get_current_power_peak(host); -} - -double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) { - return surf_host_get_power_peak_at(host, pstate_index); -} - -void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) { - surf_host_set_pstate(host, pstate_index); -} -double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) { - return surf_host_get_wattmin_at(host,pstate); -} -double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate) { - return surf_host_get_wattmax_at(host,pstate); + return sg_host_get_name(host); } void _SIMIX_host_free_process_arg(void *data) @@ -252,7 +221,7 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, /** * \brief Restart the list of processes that have been registered to the host */ -void SIMIX_host_restart_processes(sg_host_t host) +void SIMIX_host_autorestart(sg_host_t host) { unsigned int cpt; smx_process_arg_t arg; @@ -295,18 +264,11 @@ void SIMIX_host_restart_processes(sg_host_t host) xbt_dynar_reset(process_list); } -void SIMIX_host_autorestart(sg_host_t host) -{ - if(simix_global->autorestart) - simix_global->autorestart(host); - else - xbt_die("No function for simix_global->autorestart"); -} -smx_synchro_t simcall_HANDLER_process_execute(smx_simcall_t simcall, - const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) { - return SIMIX_process_execute(simcall->issuer, name,flops_amount,priority,bound,affinity_mask); +smx_synchro_t simcall_HANDLER_execution_start(smx_simcall_t simcall, + const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) { + return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound,affinity_mask); } -smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name, +smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name, double flops_amount, double priority, double bound, unsigned long affinity_mask){ /* alloc structures and initialize */ @@ -320,17 +282,19 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name, /* set surf's action */ if (!MC_is_active() && !MC_record_replay_is_active()) { - synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount); - surf_action_set_data(synchro->execution.surf_exec, synchro); - surf_action_set_priority(synchro->execution.surf_exec, priority); + synchro->execution.surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount); + synchro->execution.surf_exec->setData(synchro); + synchro->execution.surf_exec->setPriority(priority); if (bound != 0) - surf_cpu_action_set_bound(synchro->execution.surf_exec, bound); + static_cast(synchro->execution.surf_exec) + ->setBound(bound); if (affinity_mask != 0) { /* just a double check to confirm that this host is the host where this task is running. */ xbt_assert(synchro->execution.host == issuer->host); - surf_cpu_action_set_affinity(synchro->execution.surf_exec, issuer->host, affinity_mask); + static_cast(synchro->execution.surf_exec) + ->setAffinity(issuer->host->pimpl_cpu, affinity_mask); } } @@ -339,7 +303,7 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name, return synchro; } -smx_synchro_t SIMIX_process_parallel_execute(const char *name, +smx_synchro_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_host_t *host_list, double *flops_amount, double *bytes_amount, double amount, double rate){ @@ -360,51 +324,49 @@ smx_synchro_t SIMIX_process_parallel_execute(const char *name, for (i = 0; i < host_nb; i++) host_list_cpy[i] = 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_host_model_t ws_model = surf_host_get_model(host_list[0]); + /* Check that we are not mixing VMs and PMs in the parallel task */ + simgrid::surf::Host *host = host_list[0]->extension(); + bool is_a_vm = (nullptr != dynamic_cast(host)); for (i = 1; i < host_nb; i++) { - surf_host_model_t ws_model_tmp = surf_host_get_model(host_list[0]); - if (ws_model_tmp != ws_model) { - XBT_CRITICAL("mixing VMs and PMs is not supported"); - DIE_IMPOSSIBLE; - } + bool tmp_is_a_vm = (nullptr != dynamic_cast(host_list[i]->extension())); + xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet)."); } /* set surf's synchro */ if (!MC_is_active() && !MC_record_replay_is_active()) { synchro->execution.surf_exec = - surf_host_model_execute_parallel_task(surf_host_model, - host_nb, host_list_cpy, flops_amount, bytes_amount, rate); + surf_host_model->executeParallelTask( + host_nb, host_list_cpy, flops_amount, bytes_amount, rate); - surf_action_set_data(synchro->execution.surf_exec, synchro); + synchro->execution.surf_exec->setData(synchro); } XBT_DEBUG("Create parallel execute synchro %p", synchro); return synchro; } -void SIMIX_process_execution_destroy(smx_synchro_t synchro){ +void SIMIX_execution_destroy(smx_synchro_t synchro) +{ XBT_DEBUG("Destroy synchro %p", synchro); if (synchro->execution.surf_exec) { - surf_action_unref(synchro->execution.surf_exec); + synchro->execution.surf_exec->unref(); synchro->execution.surf_exec = NULL; } xbt_free(synchro->name); xbt_mallocator_release(simix_global->synchro_mallocator, synchro); } -void SIMIX_process_execution_cancel(smx_synchro_t synchro){ +void SIMIX_execution_cancel(smx_synchro_t synchro) +{ XBT_DEBUG("Cancel synchro %p", synchro); if (synchro->execution.surf_exec) - surf_action_cancel(synchro->execution.surf_exec); + synchro->execution.surf_exec->cancel(); } -double SIMIX_process_execution_get_remains(smx_synchro_t synchro){ +double SIMIX_execution_get_remains(smx_synchro_t synchro) +{ double result = 0.0; if (synchro->state == SIMIX_RUNNING) @@ -413,33 +375,37 @@ double SIMIX_process_execution_get_remains(smx_synchro_t synchro){ return result; } -e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro){ +e_smx_state_t SIMIX_execution_get_state(smx_synchro_t synchro) +{ return synchro->state; } -void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){ - +void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority) +{ if(synchro->execution.surf_exec) - surf_action_set_priority(synchro->execution.surf_exec, priority); + synchro->execution.surf_exec->setPriority(priority); } -void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){ - +void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound) +{ if(synchro->execution.surf_exec) - surf_cpu_action_set_bound(synchro->execution.surf_exec, bound); + static_cast(synchro->execution.surf_exec)->setBound(bound); } -void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){ +void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask) +{ xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE); if (synchro->execution.surf_exec) { /* just a double check to confirm that this host is the host where this task is running. */ xbt_assert(synchro->execution.host == host); - surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, mask); + static_cast(synchro->execution.surf_exec) + ->setAffinity(host->pimpl_cpu, mask); } } -void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro){ +void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro) +{ XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state); @@ -459,16 +425,16 @@ void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t SIMIX_execution_finish(synchro); } -void SIMIX_host_execution_suspend(smx_synchro_t synchro) +void SIMIX_execution_suspend(smx_synchro_t synchro) { if(synchro->execution.surf_exec) - surf_action_suspend(synchro->execution.surf_exec); + synchro->execution.surf_exec->suspend(); } -void SIMIX_host_execution_resume(smx_synchro_t synchro) +void SIMIX_execution_resume(smx_synchro_t synchro) { if(synchro->execution.surf_exec) - surf_action_resume(synchro->execution.surf_exec); + synchro->execution.surf_exec->resume(); } void SIMIX_execution_finish(smx_synchro_t synchro) @@ -501,17 +467,17 @@ void SIMIX_execution_finish(smx_synchro_t synchro) (int)synchro->state); } /* check if the host is down */ - if (simcall->issuer->host->isOff()) { + if (simcall->issuer->host->is_off()) { simcall->issuer->context->iwannadie = 1; } simcall->issuer->waiting_synchro = NULL; - simcall_process_execution_wait__set__result(simcall, synchro->state); + simcall_execution_wait__set__result(simcall, synchro->state); SIMIX_simcall_answer(simcall); } /* We no longer need it */ - SIMIX_process_execution_destroy(synchro); + SIMIX_execution_destroy(synchro); } @@ -519,11 +485,11 @@ void SIMIX_post_host_execute(smx_synchro_t synchro) { if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure * for parallel tasks too */ - synchro->execution.host->isOff()) { + synchro->execution.host->is_off()) { /* If the host running the synchro failed, notice it so that the asking * process can be killed if it runs on that host itself */ synchro->state = SIMIX_FAILED; - } else if (surf_action_get_state(synchro->execution.surf_exec) == SURF_ACTION_FAILED) { + } else if (synchro->execution.surf_exec->getState() == SURF_ACTION_FAILED) { /* If the host running the synchro didn't fail, then the synchro was * canceled */ synchro->state = SIMIX_CANCELED; @@ -532,7 +498,7 @@ void SIMIX_post_host_execute(smx_synchro_t synchro) } if (synchro->execution.surf_exec) { - surf_action_unref(synchro->execution.surf_exec); + synchro->execution.surf_exec->unref(); synchro->execution.surf_exec = NULL; } @@ -547,38 +513,8 @@ void SIMIX_set_category(smx_synchro_t synchro, const char *category) { if (synchro->state != SIMIX_RUNNING) return; if (synchro->type == SIMIX_SYNC_EXECUTE){ - surf_action_set_category(synchro->execution.surf_exec, category); + synchro->execution.surf_exec->setCategory(category); }else if (synchro->type == SIMIX_SYNC_COMMUNICATE){ - surf_action_set_category(synchro->comm.surf_comm, category); + synchro->comm.surf_comm->setCategory(category); } } - -/** - * \brief Function to get the parameters of the given the SIMIX host. - * - * \param host the host to get_phys_host (a sg_host_t) - * \param param the parameter object space to be overwritten (a ws_params_t) - */ -void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params) -{ - /* jump to ws_get_params(). */ - surf_host_get_params(ind_vm, params); -} - -void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params) -{ - /* jump to ws_set_params(). */ - surf_host_set_params(ind_vm, params); -} - -xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host){ - xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - - return surf_host_get_mounted_storage_list(host); -} - -xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host){ - xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - - return surf_host_get_attached_storage_list(host); -}