X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fbe869be3d58fb9d6fea1adfa2e8a2462231870..d99d3238efb76357fcc6437c15fb900c3c02ebd4:/src/simix/smx_host.cpp?ds=sidebyside diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 1844ad77c7..c3e5db0bc4 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -6,11 +6,10 @@ #include "smx_private.h" #include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/dict.h" #include "mc/mc.h" #include "src/mc/mc_replay.h" -#include "src/surf/host_interface.hpp" +#include "src/surf/virtual_machine.hpp" +#include "src/surf/HostImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -27,8 +26,7 @@ void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_ho s_smx_process_t proc; /* Host structure */ - smx_host->process_list = - xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); + smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); /* Update global variables */ sg_host_simix_set(host, smx_host); @@ -44,8 +42,8 @@ void SIMIX_host_on(sg_host_t h) xbt_assert((host != NULL), "Invalid parameters"); - if (h->is_off()) { - simgrid::surf::Host* surf_host = h->extension(); + if (h->isOff()) { + simgrid::surf::HostImpl* surf_host = h->extension(); surf_host->turnOn(); unsigned int cpt; @@ -93,8 +91,8 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer) xbt_assert((host != NULL), "Invalid parameters"); - if (h->is_on()) { - simgrid::surf::Host* surf_host = h->extension(); + if (h->isOn()) { + simgrid::surf::HostImpl* surf_host = h->extension(); surf_host->turnOff(); /* Clean Simulator data */ @@ -201,19 +199,16 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, arg->argv = xbt_new(char*,argc + 1); - int i; - for (i = 0; i < argc; i++) { + for (int i = 0; i < argc; i++) arg->argv[i] = xbt_strdup(argv[i]); - } arg->argv[argc] = NULL; arg->properties = properties; arg->auto_restart = auto_restart; - if( ! sg_host_is_on(host) - && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){ + if( host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){ xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,NULL); - XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host)); + XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host)); } xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg); } @@ -264,8 +259,8 @@ void SIMIX_host_autorestart(sg_host_t host) } 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); + 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_execution_start(smx_process_t issuer, const char *name, double flops_amount, double priority, double bound, unsigned long affinity_mask){ @@ -323,26 +318,19 @@ smx_synchro_t SIMIX_execution_parallel_start(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 = - host_list[0]->extension()->getModel(); + /* Check that we are not mixing VMs and PMs in the parallel task */ + simgrid::surf::HostImpl *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 = - host_list[i]->extension()->getModel(); - 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->executeParallelTask( - host_nb, host_list_cpy, flops_amount, bytes_amount, rate); + host_nb, host_list_cpy, flops_amount, bytes_amount, rate); synchro->execution.surf_exec->setData(synchro); } @@ -376,7 +364,7 @@ double SIMIX_execution_get_remains(smx_synchro_t synchro) double result = 0.0; if (synchro->state == SIMIX_RUNNING) - result = surf_action_get_remains(synchro->execution.surf_exec); + result = synchro->execution.surf_exec->getRemains(); return result; } @@ -405,8 +393,7 @@ void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigne 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); - static_cast(synchro->execution.surf_exec) - ->setAffinity(host->pimpl_cpu, mask); + static_cast(synchro->execution.surf_exec)->setAffinity(host->pimpl_cpu, mask); } } @@ -473,7 +460,7 @@ void SIMIX_execution_finish(smx_synchro_t synchro) (int)synchro->state); } /* check if the host is down */ - if (simcall->issuer->host->is_off()) { + if (simcall->issuer->host->isOff()) { simcall->issuer->context->iwannadie = 1; } @@ -491,11 +478,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->is_off()) { + synchro->execution.host->isOff()) { /* 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 (synchro->execution.surf_exec->getState() == SURF_ACTION_FAILED) { + } else if (synchro->execution.surf_exec->getState() == simgrid::surf::Action::State::failed) { /* If the host running the synchro didn't fail, then the synchro was * canceled */ synchro->state = SIMIX_CANCELED;