X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96b18f4b65694f66c8aea2d702b6f087fdcf9cb7..e13d26773d3aa31c3d0eb24816470bcf8ccc26c0:/src/simix/smx_vm.cpp diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp index 6c99ae8ded..d1b585fb40 100644 --- a/src/simix/smx_vm.cpp +++ b/src/simix/smx_vm.cpp @@ -3,9 +3,10 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "smx_private.h" #include "mc/mc.h" -#include "src/surf/virtual_machine.hpp" +#include "simgrid/s4u/VirtualMachine.hpp" +#include "smx_private.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virtual Machines"); @@ -14,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virt static long host_get_ramsize(sg_host_t vm, int *overcommit) { s_vm_params_t params; - vm->extension()->getParams(¶ms); + static_cast(vm)->parameters(¶ms); if (overcommit) *overcommit = params.overcommit; @@ -25,7 +26,7 @@ static long host_get_ramsize(sg_host_t vm, int *overcommit) /* **** start a VM **** */ static int __can_be_started(sg_host_t vm) { - sg_host_t pm = surf_vm_get_pm(vm); + sg_host_t pm = static_cast(vm)->pimpl_vm_->getPm(); int pm_overcommit = 0; long pm_ramsize = host_get_ramsize(pm, &pm_overcommit); @@ -42,7 +43,7 @@ static int __can_be_started(sg_host_t vm) } long total_ramsize_of_vms = 0; - xbt_dynar_t dyn_vms = pm->extension()->getVms(); + xbt_dynar_t dyn_vms = pm->pimpl_->getVms(); { unsigned int cursor = 0; sg_host_t another_vm; @@ -66,21 +67,11 @@ static int __can_be_started(sg_host_t vm) void SIMIX_vm_start(sg_host_t vm) { if (__can_be_started(vm)) - static_cast( - vm->extension() - )->setState(SURF_VM_STATE_RUNNING); + static_cast(vm)->pimpl_vm_->setState(SURF_VM_STATE_RUNNING); else THROWF(vm_error, 0, "The VM %s cannot be started", vm->name().c_str()); } - -e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm) -{ - return static_cast( - vm->extension() - )->getState(); -} - /** * @brief Function to migrate a SIMIX VM host. * @@ -89,53 +80,10 @@ e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm) void SIMIX_vm_migrate(sg_host_t vm, sg_host_t dst_pm) { /* precopy migration makes the VM temporally paused */ - xbt_assert(SIMIX_vm_get_state(vm) == SURF_VM_STATE_SUSPENDED); + xbt_assert(static_cast(vm)->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED); /* jump to vm_ws_xigrate(). this will update the vm location. */ - surf_vm_migrate(vm, dst_pm); -} - -/** - * @brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration - * The simcall actually invokes the following calls: - * simcall_vm_migrate(vm, dst_pm); - * simcall_vm_resume(vm); - * - * It is called at the end of the migration_rx_fun function from msg/msg_vm.c - * - * @param vm VM to migrate - * @param src_pm Source physical host - * @param dst_pmt Destination physical host - */ -void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm) -{ - /* Update the vm location */ - SIMIX_vm_migrate(vm, dst_pm); - - /* Resume the VM */ - smx_actor_t self = SIMIX_process_self(); - SIMIX_vm_resume(vm, self); -} - -/** - * @brief Function to get the physical host of the given SIMIX VM host. - * - * @param host the vm host to get_phys_host (a sg_host_t) - */ -void *SIMIX_vm_get_pm(sg_host_t host) -{ - return surf_vm_get_pm(host); -} - -/** - * @brief Function to set the CPU bound of the given SIMIX VM host. - * - * @param host the vm host (a sg_host_t) - * @param bound bound (a double) - */ -void SIMIX_vm_set_bound(sg_host_t vm, double bound) -{ - surf_vm_set_bound(vm, bound); + static_cast(vm)->pimpl_vm_->migrate(dst_pm); } /** @@ -147,13 +95,13 @@ void SIMIX_vm_set_bound(sg_host_t vm, double bound) */ void SIMIX_vm_suspend(sg_host_t vm, smx_actor_t issuer) { - if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING) + if (static_cast(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING) THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str()); XBT_DEBUG("suspend VM(%s), where %d processes exist", vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list)); /* jump to vm_ws_suspend. The state will be set. */ - surf_vm_suspend(vm); + static_cast(vm)->pimpl_vm_->suspend(); smx_actor_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) { @@ -180,30 +128,24 @@ void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t vm) * * @param vm the vm host to resume (a sg_host_t) */ -void SIMIX_vm_resume(sg_host_t vm, smx_actor_t issuer) +void SIMIX_vm_resume(sg_host_t vm) { - if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_SUSPENDED) + if (static_cast(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SUSPENDED) THROWF(vm_error, 0, "VM(%s) was not suspended", vm->name().c_str()); XBT_DEBUG("resume VM(%s), where %d processes exist", vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list)); /* jump to vm_ws_resume() */ - surf_vm_resume(vm); + static_cast(vm)->pimpl_vm_->resume(); smx_actor_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) { XBT_DEBUG("resume %s", smx_process->name.c_str()); - SIMIX_process_resume(smx_process, issuer); + SIMIX_process_resume(smx_process); } } -void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t vm) -{ - SIMIX_vm_resume(vm, simcall->issuer); -} - - /** * @brief Function to save a SIMIX VM host. * This function is the same as vm_suspend, but the state of the VM is saved to the disk, and not preserved on memory. @@ -215,13 +157,13 @@ void SIMIX_vm_save(sg_host_t vm, smx_actor_t issuer) { const char *name = sg_host_get_name(vm); - if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING) + if (static_cast(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING) THROWF(vm_error, 0, "VM(%s) is not running", name); XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(sg_host_simix(vm)->process_list)); /* jump to vm_ws_save() */ - surf_vm_save(vm); + static_cast(vm)->pimpl_vm_->save(); smx_actor_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) { @@ -235,37 +177,6 @@ void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t vm) SIMIX_vm_save(vm, simcall->issuer); } - -/** - * @brief Function to restore a SIMIX VM host. This function restart the execution of the - * VM. All the processes on this VM will run again. - * - * @param vm the vm host to restore (a sg_host_t) - */ -void SIMIX_vm_restore(sg_host_t vm, smx_actor_t issuer) -{ - if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_SAVED) - THROWF(vm_error, 0, "VM(%s) was not saved", vm->name().c_str()); - - XBT_DEBUG("restore VM(%s), where %d processes exist", - vm->name().c_str(), xbt_swag_size(sg_host_simix(vm)->process_list)); - - /* jump to vm_ws_restore() */ - surf_vm_resume(vm); - - smx_actor_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) { - XBT_DEBUG("resume %s", smx_process->name.c_str()); - SIMIX_process_resume(smx_process, issuer); - } -} - -void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t vm) -{ - SIMIX_vm_restore(vm, simcall->issuer); -} - - /** * @brief Function to shutdown a SIMIX VM host. This function powers off the * VM. All the processes on this VM will be killed. But, the state of the VM is @@ -275,7 +186,7 @@ void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t vm) */ void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer) { - if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING) + if (static_cast(vm)->pimpl_vm_->getState() != SURF_VM_STATE_RUNNING) THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str()); XBT_DEBUG("shutdown VM %s, that contains %d processes", @@ -288,39 +199,10 @@ void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer) } /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */ - static_cast( - vm->extension() - )->setState(SURF_VM_STATE_CREATED); + static_cast(vm)->pimpl_vm_->setState(SURF_VM_STATE_CREATED); } void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t vm) { SIMIX_vm_shutdown(vm, simcall->issuer); } - -extern xbt_dict_t host_list; // FIXME:killme don't dupplicate the content of s4u::Host this way - /** - * @brief Function to destroy a SIMIX VM host. - * - * @param vm the vm host to destroy (a sg_host_t) - */ -void SIMIX_vm_destroy(sg_host_t vm) -{ - /* this code basically performs a similar thing like SIMIX_host_destroy() */ - XBT_DEBUG("destroy %s", vm->name().c_str()); - - /* FIXME: this is really strange that everything fails if the next line is removed. - * This is as if we shared these data with the PM, which definitely should not be the case... - * - * We need to test that suspending a VM does not suspends the processes running on its PM, for example. - * Or we need to simplify this code enough to make it actually readable (but this sounds harder than testing) - */ - vm->extension_set(nullptr); - - /* Don't free these things twice: they are the ones of my physical host */ - vm->pimpl_cpu = nullptr; - vm->pimpl_netcard = nullptr; - - if (xbt_dict_get_or_null(host_list, vm->name().c_str())) - xbt_dict_remove(host_list, vm->name().c_str()); -}