X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce603fdbafff94b48f9e97700931d017c6da2c5c..a924fc6f7328160d99348f7d3de23fc50930ea03:/src/msg/msg_vm.cpp?ds=sidebyside diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 714b70f8e7..5eb5d1beeb 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -12,6 +12,7 @@ #include #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/plugins/vm/VmHostExt.hpp" #include #include @@ -20,6 +21,8 @@ #include "xbt/log.h" #include "simgrid/host.h" +#include "src/simix/smx_host_private.h" /* don't ask me why the VM functions are in there (FIXME:KILLME) */ + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API"); @@ -50,7 +53,7 @@ void MSG_vm_get_params(msg_vm_t vm, vm_params_t params) /* **** Check state of a VM **** */ static inline int __MSG_vm_is_state(msg_vm_t vm, e_surf_vm_state_t state) { - return simcall_vm_get_state(vm) == state; + return static_cast(vm)->pimpl_vm_->getState() == state; } /** @brief Returns whether the given VM has just created, not running. @@ -125,8 +128,9 @@ int MSG_vm_is_restoring(msg_vm_t vm) msg_vm_t MSG_vm_create(msg_host_t pm, const char *name, int ncpus, int ramsize, int net_cap, char *disk_path, int disksize, int mig_netspeed, int dp_intensity) { - /* For the moment, intensity_rate is the percentage against the migration - * bandwidth */ + simgrid::vm::VmHostExt::ensureVmExtInstalled(); + + /* For the moment, intensity_rate is the percentage against the migration bandwidth */ double host_speed = MSG_host_get_speed(pm); double update_speed = ((double)dp_intensity/100) * mig_netspeed; @@ -154,28 +158,12 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char *name, int ncpus, int ramsize, * * A VM is treated as a host. The name of the VM must be unique among all hosts. */ -msg_vm_t MSG_vm_create_core(msg_host_t ind_pm, const char *name) +msg_vm_t MSG_vm_create_core(msg_host_t pm, const char* name) { - /* make sure the VM of the same name does not exit */ - { - simgrid::s4u::Host* ind_host_tmp = sg_host_by_name(name); - if (ind_host_tmp != nullptr && sg_host_simix(ind_host_tmp) != nullptr) { - XBT_ERROR("host %s already exits", name); - return nullptr; - } - } - - /* Note: ind_vm and vm_workstation point to the same elm object. */ - /* Ask the SIMIX layer to create the surf vm resource */ - sg_host_t ind_vm_workstation = simcall_vm_create(name, ind_pm); - - msg_vm_t ind_vm = (msg_vm_t) __MSG_host_create(ind_vm_workstation); - - XBT_DEBUG("A new VM (%s) has been created", name); - - TRACE_msg_vm_create(name, ind_pm); + xbt_assert(sg_host_by_name(name) == nullptr, + "Cannot create a VM named %s: this name is already used by an host or a VM", name); - return ind_vm; + return new simgrid::s4u::VirtualMachine(name, pm); } /** @brief Destroy a VM. Destroy the VM object from the simulation. @@ -184,19 +172,18 @@ msg_vm_t MSG_vm_create_core(msg_host_t ind_pm, const char *name) void MSG_vm_destroy(msg_vm_t vm) { if (MSG_vm_is_migrating(vm)) - THROWF(vm_error, 0, "VM(%s) is migrating", sg_host_get_name(vm)); + THROWF(vm_error, 0, "VM(%s) is migrating", vm->name().c_str()); /* First, terminate all processes on the VM if necessary */ if (MSG_vm_is_running(vm)) - simcall_vm_shutdown(vm); + MSG_vm_shutdown(vm); - if (!MSG_vm_is_created(vm)) { - XBT_CRITICAL("shutdown the given VM before destroying it"); - DIE_IMPOSSIBLE; - } + xbt_assert(MSG_vm_is_created(vm), "shutdown the given VM before destroying it"); /* Then, destroy the VM object */ - simcall_vm_destroy(vm); + simgrid::simix::kernelImmediate([vm]() { + vm->destroy(); + }); TRACE_msg_vm_end(vm); } @@ -223,7 +210,8 @@ void MSG_vm_shutdown(msg_vm_t vm) { /* msg_vm_t equals to msg_host_t */ simcall_vm_shutdown(vm); - + MSG_process_sleep(0.); // Make sure that the processes in the VM are killed in this scheduling round before processing + // (eg with the VM destroy) // TRACE_msg_vm_(vm); } @@ -332,21 +320,22 @@ static int migration_rx_fun(int argc, char *argv[]) msg_host_t src_pm = ms->src_pm; msg_host_t dst_pm = ms->dst_pm; - // TODO: we have an issue, if the DST node is turning off during the three next calls, then the VM is in an - // inconsistent - // state. I should check with Takahiro in order to make this portion of code atomic - // - // /* Update the vm location */ - // simcall_vm_migrate(vm, dst_pm); - // - // /* Resume the VM */ - // simcall_vm_resume(vm); - // - simcall_vm_migratefrom_resumeto(vm, src_pm, dst_pm); + // Make sure that we cannot get interrupted between the migrate and the resume to not end in an inconsistent state + simgrid::simix::kernelImmediate([vm, src_pm, dst_pm]() { + /* Update the vm location */ + /* precopy migration makes the VM temporally paused */ + xbt_assert(static_cast(vm)->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED); + + /* jump to vm_ws_xigrate(). this will update the vm location. */ + static_cast(vm)->pimpl_vm_->migrate(dst_pm); + + /* Resume the VM */ + SIMIX_vm_resume(vm); + }); { // Now the VM is running on the new host (the migration is completed) (even if the SRC crash) - static_cast(vm->pimpl_)->isMigrating = false; + vm->pimpl_vm_->isMigrating = false; XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", sg_host_get_name(ms->vm), sg_host_get_name(ms->src_pm), sg_host_get_name(ms->dst_pm)); TRACE_msg_vm_change_host(ms->vm, ms->src_pm, ms->dst_pm); @@ -395,16 +384,14 @@ static void reset_dirty_pages(msg_vm_t vm) static void start_dirty_page_tracking(msg_vm_t vm) { - simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm->pimpl_); - pimpl->dp_enabled = 1; + static_cast(vm)->pimpl_vm_->dp_enabled = 1; reset_dirty_pages(vm); } static void stop_dirty_page_tracking(msg_vm_t vm) { - simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm->pimpl_); - pimpl->dp_enabled = 0; + static_cast(vm)->pimpl_vm_->dp_enabled = 0; } static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock) @@ -420,7 +407,7 @@ static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remai static double lookup_computed_flop_counts(msg_vm_t vm, int stage_for_fancy_debug, int stage2_round_for_fancy_debug) { - simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm->pimpl_); + simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; double total = 0; char *key = nullptr;