X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1928b36ff7a719c88d3db6b4e685bed8f544c7da..783b33766eccfc78e3b205d896323169ec42e7c1:/src/simix/smx_vm.cpp diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp index f7b6c3e4b4..ba05d17e6a 100644 --- a/src/simix/smx_vm.cpp +++ b/src/simix/smx_vm.cpp @@ -119,7 +119,6 @@ void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_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_set_affinity(vm, src_pm, 0); * simcall_vm_migrate(vm, dst_pm); * simcall_vm_resume(vm); * @@ -131,14 +130,11 @@ void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm) */ void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm) { - /* deinstall the current affinity setting for the CPU */ - SIMIX_vm_set_affinity(vm, src_pm, 0); - /* Update the vm location */ SIMIX_vm_migrate(vm, dst_pm); /* Resume the VM */ - smx_process_t self = SIMIX_process_self(); + smx_actor_t self = SIMIX_process_self(); SIMIX_vm_resume(vm, self->simcall.issuer); } @@ -147,10 +143,9 @@ void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst * * @param host the vm host to get_phys_host (a sg_host_t) */ -void *SIMIX_vm_get_pm(sg_host_t ind_vm) +void *SIMIX_vm_get_pm(sg_host_t host) { - /* jump to vm_ws_get_pm(). this will return the vm name. */ - return surf_vm_get_pm(ind_vm); + return surf_vm_get_pm(host); } /** @@ -159,50 +154,30 @@ void *SIMIX_vm_get_pm(sg_host_t ind_vm) * @param host the vm host (a sg_host_t) * @param bound bound (a double) */ -void SIMIX_vm_set_bound(sg_host_t ind_vm, double bound) -{ - /* jump to vm_ws_set_vm_bound(). */ - surf_vm_set_bound(ind_vm, bound); -} - -/** - * @brief Function to set the CPU affinity of the given SIMIX VM host. - * - * @param host the vm host (a sg_host_t) - * @param host the pm host (a sg_host_t) - * @param mask affinity mask (a unsigned long) - */ -void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mask) +void SIMIX_vm_set_bound(sg_host_t vm, double bound) { - /* make sure this at the MSG layer. */ - xbt_assert(SIMIX_vm_get_pm(ind_vm) == ind_pm); - - /* jump to vm_ws_set_vm_affinity(). */ - surf_vm_set_affinity(ind_vm, ind_pm, mask); + surf_vm_set_bound(vm, bound); } - /** * @brief Function to suspend a SIMIX VM host. This function stops the execution of the * VM. All the processes on this VM will pause. The state of the VM is * preserved on memory. We can later resume it again. * - * @param host the vm host to suspend (a sg_host_t) + * @param vm the vm host to suspend (a sg_host_t) */ -void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer) +void SIMIX_vm_suspend(sg_host_t vm, smx_actor_t issuer) { - const char *name = sg_host_get_name(ind_vm); - - if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING) - THROWF(vm_error, 0, "VM(%s) is not running", name); + if (SIMIX_vm_get_state(vm) != 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", name, xbt_swag_size(sg_host_simix(ind_vm)->process_list)); + 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(ind_vm); + surf_vm_suspend(vm); - smx_process_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) { + 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("suspend %s", smx_process->name.c_str()); SIMIX_process_suspend(smx_process, issuer); } @@ -210,14 +185,11 @@ void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer) XBT_DEBUG("suspend all processes on the VM done done"); } -void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm) +void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t vm) { - if (simcall->issuer->host == ind_vm) { - XBT_ERROR("cannot suspend the VM where I run"); - DIE_IMPOSSIBLE; - } + xbt_assert(simcall->issuer->host != vm, "cannot suspend the VM where I run"); - SIMIX_vm_suspend(ind_vm, simcall->issuer); + SIMIX_vm_suspend(vm, simcall->issuer); XBT_DEBUG("simcall_HANDLER_vm_suspend done"); } @@ -227,30 +199,29 @@ void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm) * @brief Function to resume a SIMIX VM host. This function restart the execution of the * VM. All the processes on this VM will run again. * - * @param host the vm host to resume (a sg_host_t) + * @param vm the vm host to resume (a sg_host_t) */ -void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer) +void SIMIX_vm_resume(sg_host_t vm, smx_actor_t issuer) { - const char *name = sg_host_get_name(ind_vm); - - if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SUSPENDED) - THROWF(vm_error, 0, "VM(%s) was not suspended", name); + if (SIMIX_vm_get_state(vm) != 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", name, xbt_swag_size(sg_host_simix(ind_vm)->process_list)); + 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(ind_vm); + surf_vm_resume(vm); - smx_process_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) { + 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_resume(smx_simcall_t simcall, sg_host_t ind_vm) +void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t vm) { - SIMIX_vm_resume(ind_vm, simcall->issuer); + SIMIX_vm_resume(vm, simcall->issuer); } @@ -259,31 +230,30 @@ void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_vm) * This function is the same as vm_suspend, but the state of the VM is saved to the disk, and not preserved on memory. * We can later restore it again. * - * @param host the vm host to save (a sg_host_t) + * @param vm the vm host to save (a sg_host_t) */ -void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer) +void SIMIX_vm_save(sg_host_t vm, smx_actor_t issuer) { - const char *name = sg_host_get_name(ind_vm); + const char *name = sg_host_get_name(vm); - if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING) + if (SIMIX_vm_get_state(vm) != 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(ind_vm)->process_list)); + 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(ind_vm); + surf_vm_save(vm); - smx_process_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) { + 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("suspend %s", smx_process->name.c_str()); SIMIX_process_suspend(smx_process, issuer); } } -void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm) +void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t vm) { - SIMIX_vm_save(ind_vm, simcall->issuer); + SIMIX_vm_save(vm, simcall->issuer); } @@ -291,30 +261,29 @@ void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm) * @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 host the vm host to restore (a sg_host_t) + * @param vm the vm host to restore (a sg_host_t) */ -void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer) +void SIMIX_vm_restore(sg_host_t vm, smx_actor_t issuer) { - const char *name = sg_host_get_name(ind_vm); + if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_SAVED) + THROWF(vm_error, 0, "VM(%s) was not saved", vm->name().c_str()); - if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SAVED) - THROWF(vm_error, 0, "VM(%s) was not saved", name); - - XBT_DEBUG("restore VM(%s), where %d processes exist", name, xbt_swag_size(sg_host_simix(ind_vm)->process_list)); + 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(ind_vm); + surf_vm_resume(vm); - smx_process_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) { + 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 ind_vm) +void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t vm) { - SIMIX_vm_restore(ind_vm, simcall->issuer); + SIMIX_vm_restore(vm, simcall->issuer); } @@ -323,36 +292,33 @@ void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm) * VM. All the processes on this VM will be killed. But, the state of the VM is * preserved on memory. We can later start it again. * - * @param host the vm host to shutdown (a sg_host_t) + * @param vm the VM to shutdown (a sg_host_t) */ -void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer) +void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer) { - const char *name = sg_host_get_name(ind_vm); - - if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING) - THROWF(vm_error, 0, "VM(%s) is not running", name); + if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_RUNNING) + THROWF(vm_error, 0, "VM(%s) is not running", vm->name().c_str()); - XBT_DEBUG("shutdown %s", name); - XBT_DEBUG("%d processes in the VM", xbt_swag_size(sg_host_simix(ind_vm)->process_list)); + XBT_DEBUG("shutdown VM %s, that contains %d processes", + vm->name().c_str(),xbt_swag_size(sg_host_simix(vm)->process_list)); - smx_process_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(ind_vm)->process_list) { + 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("kill %s", smx_process->name.c_str()); SIMIX_process_kill(smx_process, issuer); } /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */ static_cast( - ind_vm->extension() + vm->extension() )->setState(SURF_VM_STATE_CREATED); } -void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm) +void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t vm) { - SIMIX_vm_shutdown(ind_vm, simcall->issuer); + SIMIX_vm_shutdown(vm, simcall->issuer); } - /** * @brief Function to destroy a SIMIX VM host. * @@ -361,14 +327,17 @@ void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm) void SIMIX_vm_destroy(sg_host_t vm) { /* this code basically performs a similar thing like SIMIX_host_destroy() */ - - const char *hostname = sg_host_get_name(vm); - - XBT_DEBUG("destroy %s", hostname); - - /* this will call the registered callback function, i.e., SIMIX_host_destroy(). */ - sg_host_simix_destroy(vm); - - /* jump to vm_ws_destroy(). The surf level resource will be freed. */ - surf_vm_destroy(vm); + 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; }