X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04abcb2172a79bd5896fe72de03d084f1c07e782..772bc61dbf607370584a58f7342df76d7bbc3b56:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 2a2fee7a10..91cb6c8649 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 */ @@ -263,11 +261,11 @@ void SIMIX_host_autorestart(sg_host_t host) xbt_dynar_reset(process_list); } -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 */ @@ -281,7 +279,7 @@ 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 = issuer->host->pimpl_cpu->execute(flops_amount); + synchro->execution.surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount); synchro->execution.surf_exec->setData(synchro); synchro->execution.surf_exec->setPriority(priority); @@ -302,7 +300,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){ @@ -323,26 +321,19 @@ 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 = - 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); } @@ -351,7 +342,8 @@ smx_synchro_t SIMIX_process_parallel_execute(const char *name, 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) { @@ -362,40 +354,43 @@ void SIMIX_process_execution_destroy(smx_synchro_t synchro){ 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) 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) - result = surf_action_get_remains(synchro->execution.surf_exec); + result = synchro->execution.surf_exec->getRemains(); 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) - synchro->execution.surf_exec->setPriority(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) - static_cast(synchro->execution.surf_exec) - ->setBound(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) { @@ -406,7 +401,8 @@ void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, } } -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); @@ -426,13 +422,13 @@ 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) 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) synchro->execution.surf_exec->resume(); @@ -468,17 +464,17 @@ 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; } 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); } @@ -486,7 +482,7 @@ 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;