X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1915318b8c2435908c6471242a7de6e034710355..8cf6e30af8de6686461b6b1b52ba578df01de985:/src/msg/msg_vm.cpp diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 5c268ac091..873e41a42e 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -11,21 +11,24 @@ #include +#include "src/instr/instr_private.h" +#include "src/msg/msg_private.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" -#include -#include -#include "msg_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" #include "simgrid/host.h" +#include "simgrid/simix.hpp" -#include "src/simix/smx_host_private.h" /* don't ask me why the VM functions are in there (FIXME:KILLME) */ +struct dirty_page { + double prev_clock; + double prev_remaining; + msg_task_t task; +}; +typedef struct dirty_page s_dirty_page; +typedef struct dirty_page* dirty_page_t; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API"); - /* **** ******** GENERAL ********* **** */ /** \ingroup m_vm_management @@ -88,45 +91,16 @@ int MSG_vm_is_suspended(msg_vm_t vm) return __MSG_vm_is_state(vm, SURF_VM_STATE_SUSPENDED); } -/** @brief Returns whether the given VM is being saved (FIXME: live saving or not?). - * @ingroup msg_VMs - */ -int MSG_vm_is_saving(msg_vm_t vm) -{ - return __MSG_vm_is_state(vm, SURF_VM_STATE_SAVING); -} - -/** @brief Returns whether the given VM has been saved, not running. - * @ingroup msg_VMs - */ -int MSG_vm_is_saved(msg_vm_t vm) -{ - return __MSG_vm_is_state(vm, SURF_VM_STATE_SAVED); -} - -/** @brief Returns whether the given VM is being restored, not running. - * @ingroup msg_VMs - */ -int MSG_vm_is_restoring(msg_vm_t vm) -{ - return __MSG_vm_is_state(vm, SURF_VM_STATE_RESTORING); -} - /* **** ******** MSG vm actions ********* **** */ /** @brief Create a new VM with specified parameters. * @ingroup msg_VMs* * @param pm Physical machine that will host the VM - * @param name [TODO] - * @param ncpus [TODO] + * @param name Must be unique * @param ramsize [TODO] - * @param net_cap Maximal bandwidth that the VM can consume (in MByte/s) - * @param disk_path (unused) Path to the image that boots - * @param disksize (unused) will represent the size of the VM (will be used during migrations) * @param mig_netspeed Amount of Mbyte/s allocated to the migration (cannot be larger than net_cap). Use 0 if unsure. * @param dp_intensity Dirty page percentage according to migNetSpeed, [0-100]. Use 0 if unsure. */ -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) +msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_netspeed, int dp_intensity) { simgrid::vm::VmHostExt::ensureVmExtInstalled(); @@ -138,7 +112,6 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ncpus, int ramsize, s_vm_params_t params; memset(¶ms, 0, sizeof(params)); params.ramsize = (sg_size_t)ramsize * 1024 * 1024; - //params.overcommit = 0; params.devsize = 0; params.skip_stage2 = 0; params.max_downtime = 0.03; @@ -146,8 +119,8 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ncpus, int ramsize, params.dp_cap = params.ramsize * 0.9; // assume working set memory is 90% of ramsize params.mig_speed = (double)mig_netspeed * 1024 * 1024; // mig_speed - //XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate, - // params.mig_speed, dp_intensity, update_speed, host_speed); + XBT_DEBUG("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f", params.dp_rate, + params.mig_speed, dp_intensity, update_speed, host_speed); static_cast(vm)->setParameters(¶ms); return vm; @@ -186,7 +159,7 @@ void MSG_vm_destroy(msg_vm_t vm) }); if (TRACE_msg_vm_is_enabled()) { - container_t container = PJ_container_get(vm->name().c_str()); + container_t container = PJ_container_get(vm->cname()); PJ_container_remove_from_parent(container); PJ_container_free(container); } @@ -195,29 +168,60 @@ void MSG_vm_destroy(msg_vm_t vm) /** @brief Start a vm (i.e., boot the guest operating system) * @ingroup msg_VMs * - * If the VM cannot be started, an exception is generated. + * If the VM cannot be started (because of memory overprovisionning), an exception is generated. */ void MSG_vm_start(msg_vm_t vm) { - simcall_vm_start(vm); + simgrid::simix::kernelImmediate([vm]() { + simgrid::vm::VmHostExt::ensureVmExtInstalled(); + + simgrid::s4u::VirtualMachine* typedVM = static_cast(vm); + simgrid::s4u::Host* pm = typedVM->pimpl_vm_->getPm(); + if (pm->extension() == nullptr) + pm->extension_set(new simgrid::vm::VmHostExt()); + + long pm_ramsize = pm->extension()->ramsize; + int pm_overcommit = pm->extension()->overcommit; + long vm_ramsize = typedVM->getRamsize(); + + if (pm_ramsize && !pm_overcommit) { /* Only verify that we don't overcommit on need */ + /* Retrieve the memory occupied by the VMs on that host. Yep, we have to traverse all VMs of all hosts for that */ + long total_ramsize_of_vms = 0; + for (simgrid::s4u::VirtualMachine* ws_vm : simgrid::vm::VirtualMachineImpl::allVms_) + if (pm == ws_vm->pimpl_vm_->getPm()) + total_ramsize_of_vms += ws_vm->pimpl_vm_->getRamsize(); + + if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) { + XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).", + vm->cname(), pm->cname(), vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize); + THROWF(vm_error, 0, "Memory shortage on host '%s', VM '%s' cannot be started", pm->cname(), vm->cname()); + } + } + + typedVM->pimpl_vm_->setState(SURF_VM_STATE_RUNNING); + }); if (TRACE_msg_vm_is_enabled()) { - container_t vm_container = PJ_container_get(vm->name().c_str()); + container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); val_t value = PJ_value_get_or_new("start", "0 0 1", type); // start is blue new_pajePushState(MSG_get_clock(), vm_container, type, value); } } -/** @brief Immediately kills all processes within the given VM. Any memory that they allocated will be leaked. +/** @brief Immediately kills all processes within the given VM. * @ingroup msg_VMs * - * FIXME: No extra delay occurs. If you want to simulate this too, you want to use a #MSG_process_sleep() or something. - * I'm not quite sure. + * Any memory that they allocated will be leaked, unless you used #MSG_process_on_exit(). + * + * No extra delay occurs. If you want to simulate this too, you want to use a #MSG_process_sleep(). */ void MSG_vm_shutdown(msg_vm_t vm) { - simcall_vm_shutdown(vm); + smx_actor_t issuer=SIMIX_process_self(); + simgrid::simix::kernelImmediate([vm,issuer]() { + static_cast(vm)->pimpl_vm_->shutdown(issuer); + }); // Make sure that the processes in the VM are killed in this scheduling round before processing // (eg with the VM destroy) @@ -293,13 +297,11 @@ static int migration_rx_fun(int argc, char *argv[]) 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); + xbt_assert(vm->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED); - /* Resume the VM */ - SIMIX_vm_resume(vm); + /* Update the vm location and resume it */ + vm->pimpl_vm_->setPm(dst_pm); + vm->pimpl_vm_->resume(); }); { @@ -313,20 +315,20 @@ static int migration_rx_fun(int argc, char *argv[]) snprintf(key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++); // start link - container_t msg = PJ_container_get(vm->name().c_str()); + container_t msg = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); new_pajeStartLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); // destroy existing container of this vm - container_t existing_container = PJ_container_get(vm->name().c_str()); + container_t existing_container = PJ_container_get(vm->cname()); PJ_container_remove_from_parent(existing_container); PJ_container_free(existing_container); // create new container on the new_host location - PJ_container_new(vm->cname(), INSTR_MSG_VM, PJ_container_get(sg_host_get_name(ms->dst_pm))); + PJ_container_new(vm->cname(), INSTR_MSG_VM, PJ_container_get(ms->dst_pm->cname())); // end link - msg = PJ_container_get(vm->name().c_str()); + msg = PJ_container_get(vm->cname()); type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); } @@ -355,7 +357,7 @@ static int migration_rx_fun(int argc, char *argv[]) static void start_dirty_page_tracking(msg_vm_t vm) { - simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; + simgrid::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; pimpl->dp_enabled = 1; if (!pimpl->dp_objs) @@ -383,15 +385,15 @@ static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remai double computed = dp->prev_remaining - remaining; double duration = clock - dp->prev_clock; - XBT_DEBUG("%s@%s: computed %f ops (remaining %f -> %f) in %f secs (%f -> %f)", - key, sg_host_get_name(vm), computed, dp->prev_remaining, remaining, duration, dp->prev_clock, clock); + XBT_DEBUG("%s@%s: computed %f ops (remaining %f -> %f) in %f secs (%f -> %f)", key, vm->cname(), computed, + dp->prev_remaining, remaining, duration, dp->prev_clock, clock); return computed; } 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_vm_; + simgrid::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; double total = 0; char *key = nullptr; @@ -427,7 +429,7 @@ void MSG_host_add_task(msg_host_t host, msg_task_t task) simgrid::s4u::VirtualMachine* vm = dynamic_cast(host); if (vm == nullptr) return; - simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; + simgrid::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; double remaining = MSG_task_get_flops_amount(task); char *key = bprintf("%s-%p", task->name, task); @@ -439,10 +441,10 @@ void MSG_host_add_task(msg_host_t host, msg_task_t task) dp->prev_remaining = remaining; } if (!pimpl->dp_objs) - pimpl->dp_objs = xbt_dict_new(); + pimpl->dp_objs = xbt_dict_new_homogeneous(nullptr); xbt_assert(xbt_dict_get_or_null(pimpl->dp_objs, key) == nullptr); xbt_dict_set(pimpl->dp_objs, key, dp, nullptr); - XBT_DEBUG("add %s on %s (remaining %f, dp_enabled %d)", key, sg_host_get_name(host), remaining, pimpl->dp_enabled); + XBT_DEBUG("add %s on %s (remaining %f, dp_enabled %d)", key, host->cname(), remaining, pimpl->dp_enabled); xbt_free(key); } @@ -452,7 +454,7 @@ void MSG_host_del_task(msg_host_t host, msg_task_t task) simgrid::s4u::VirtualMachine* vm = dynamic_cast(host); if (vm == nullptr) return; - simgrid::surf::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; + simgrid::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; char *key = bprintf("%s-%p", task->name, task); dirty_page_t dp = (dirty_page_t)(pimpl->dp_objs ? xbt_dict_get_or_null(pimpl->dp_objs, key) : NULL); @@ -472,7 +474,7 @@ void MSG_host_del_task(msg_host_t host, msg_task_t task) xbt_dict_remove(pimpl->dp_objs, key); xbt_free(dp); - XBT_DEBUG("del %s on %s", key, sg_host_get_name(host)); + XBT_DEBUG("del %s on %s", key, host->cname()); xbt_free(key); } @@ -507,11 +509,11 @@ static sg_size_t send_migration_data(msg_vm_t vm, msg_host_t src_pm, msg_host_t if(ret == MSG_HOST_FAILURE){ //XBT_DEBUG("SRC host failed during migration of %s (stage %d)", sg_host_name(vm), stage); MSG_task_destroy(task); - THROWF(host_error, 0, "SRC host failed during migration of %s (stage %d)", sg_host_get_name(vm), stage); + THROWF(host_error, 0, "SRC host failed during migration of %s (stage %d)", vm->cname(), stage); }else if(ret == MSG_TRANSFER_FAILURE){ //XBT_DEBUG("DST host failed during migration of %s (stage %d)", sg_host_name(vm), stage); MSG_task_destroy(task); - THROWF(host_error, 0, "DST host failed during migration of %s (stage %d)", sg_host_get_name(vm), stage); + THROWF(host_error, 0, "DST host failed during migration of %s (stage %d)", vm->cname(), stage); } double clock_end = MSG_get_clock(); @@ -541,33 +543,6 @@ static sg_size_t get_updated_size(double computed, double dp_rate, double dp_cap return (sg_size_t) updated_size; } -static double send_stage1(struct migration_session* ms, sg_size_t ramsize, double mig_speed, double dp_rate, - double dp_cap) -{ - // const long chunksize = (sg_size_t)1024 * 1024 * 100; - const sg_size_t chunksize = (sg_size_t)1024 * 1024 * 100000; - sg_size_t remaining = ramsize; - double computed_total = 0; - - while (remaining > 0) { - sg_size_t datasize = chunksize; - if (remaining < chunksize) - datasize = remaining; - - remaining -= datasize; - send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, datasize, ms->mbox, 1, 0, mig_speed, -1); - double computed = lookup_computed_flop_counts(ms->vm, 1, 0); - computed_total += computed; - } - - return computed_total; -} - -static double get_threshold_value(double bandwidth, double max_downtime) -{ - return max_downtime * bandwidth; -} - static int migration_tx_fun(int argc, char *argv[]) { XBT_DEBUG("mig: tx_start"); @@ -586,9 +561,7 @@ static int migration_tx_fun(int argc, char *argv[]) const double mig_speed = params.mig_speed; double max_downtime = params.max_downtime; - /* hard code it temporally. Fix Me */ -#define MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME 10000000.0 - double mig_timeout = MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME; + double mig_timeout = 10000000.0; double remaining_size = (double) (ramsize + devsize); double threshold = 0.0; @@ -635,14 +608,13 @@ static int migration_tx_fun(int argc, char *argv[]) double clock_post_send = MSG_get_clock(); mig_timeout -= (clock_post_send - clock_prev_send); if (mig_timeout < 0) { - XBT_VERB("The duration of stage 1 exceeds the timeout value (%lf > %lf), skip stage 2", - (clock_post_send - clock_prev_send), MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME); + XBT_VERB("The duration of stage 1 exceeds the timeout value, skip stage 2"); skip_stage2 = 1; } /* estimate bandwidth */ double bandwidth = ramsize / (clock_post_send - clock_prev_send); - threshold = get_threshold_value(bandwidth, max_downtime); + threshold = bandwidth * max_downtime; XBT_DEBUG("actual bandwidth %f (MB/s), threshold %f", bandwidth / 1024 / 1024, threshold); } @@ -690,7 +662,7 @@ static int migration_tx_fun(int argc, char *argv[]) if (sent == updated_size) { /* timeout did not happen */ double bandwidth = updated_size / (clock_post_send - clock_prev_send); - threshold = get_threshold_value(bandwidth, max_downtime); + threshold = bandwidth * max_downtime; XBT_DEBUG("actual bandwidth %f, threshold %f", bandwidth / 1024 / 1024, threshold); remaining_size -= sent; stage2_round += 1; @@ -715,7 +687,10 @@ static int migration_tx_fun(int argc, char *argv[]) /* Stage3: stop the VM and copy the rest of states. */ XBT_DEBUG("mig-stage3: remaining_size %f", remaining_size); - simcall_vm_suspend(ms->vm); + simgrid::vm::VirtualMachineImpl* pimpl = static_cast(ms->vm)->pimpl_vm_; + pimpl->setState(SURF_VM_STATE_RUNNING); // FIXME: this bypass of the checks in suspend() is not nice + pimpl->isMigrating = false; // FIXME: this bypass of the checks in suspend() is not nice + pimpl->suspend(SIMIX_process_self()); stop_dirty_page_tracking(ms->vm); try { @@ -725,7 +700,7 @@ static int migration_tx_fun(int argc, char *argv[]) catch(xbt_ex& e) { //hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code) // Stop the dirty page tracking an return (there is no memory space to release) - simcall_vm_resume(ms->vm); + static_cast(ms->vm)->pimpl_vm_->resume(); return 0; } @@ -736,8 +711,42 @@ static int migration_tx_fun(int argc, char *argv[]) return 0; } -static int do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) +/** @brief Migrate the VM to the given host. + * @ingroup msg_VMs + */ +void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) { + /* some thoughts: + * - One approach is ... + * We first create a new VM (i.e., destination VM) on the destination physical host. The destination VM will + * receive the state of the source + * VM over network. We will finally destroy the source VM. + * - This behavior is similar to the way of migration in the real world. + * Even before a migration is completed, we will see a destination VM, consuming resources. + * - We have to relocate all processes. The existing process migration code will work for this? + * - The name of the VM is a somewhat unique ID in the code. It is tricky for the destination VM? + * + * - Another one is ... + * We update the information of the given VM to place it to the destination physical host. + * + * The second one would be easier. + */ + + simgrid::s4u::VirtualMachine* typedVm = static_cast(vm); + simgrid::vm::VirtualMachineImpl* pimpl = typedVm->pimpl_vm_; + msg_host_t src_pm = pimpl->getPm(); + + if (src_pm->isOff()) + THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->cname(), src_pm->cname()); + if (dst_pm->isOff()) + THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->cname(), dst_pm->cname()); + if (!MSG_vm_is_running(vm)) + THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->cname()); + if (typedVm->isMigrating()) + THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->cname()); + + pimpl->isMigrating = true; + struct migration_session *ms = xbt_new(struct migration_session, 1); ms->vm = vm; ms->src_pm = src_pm; @@ -765,9 +774,11 @@ static int do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) XBT_DEBUG("wait for reception of the final ACK (i.e. migration has been correctly performed"); msg_task_t task = nullptr; msg_error_t ret = MSG_TIMEOUT; - while (ret == MSG_TIMEOUT && MSG_host_is_on(dst_pm)) // Wait while you receive the message o + while (ret == MSG_TIMEOUT && dst_pm->isOn()) // The rx will tell me when he gots the VM ret = MSG_task_receive_with_timeout(&task, ms->mbox_ctl, 4); + pimpl->isMigrating = false; + xbt_free(ms->mbox_ctl); xbt_free(ms->mbox); xbt_free(ms); @@ -778,71 +789,18 @@ static int do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) XBT_ERROR("SRC crashes, throw an exception (m-control)"); // MSG_process_kill(tx_process); // Adrien, I made a merge on Nov 28th 2014, I'm not sure whether this line is // required or not - return -1; + THROWF(host_error, 0, "Source host '%s' failed during the migration of VM '%s'.", src_pm->cname(), vm->cname()); } else if ((ret == MSG_TRANSFER_FAILURE) || (ret == MSG_TIMEOUT)) { // MSG_TIMEOUT here means that MSG_host_is_avail() returned false. XBT_ERROR("DST crashes, throw an exception (m-control)"); - return -2; + THROWF(host_error, 0, "Destination host '%s' failed during the migration of VM '%s'.", dst_pm->cname(), + vm->cname()); } char* expected_task_name = get_mig_task_name(vm, src_pm, dst_pm, 4); xbt_assert(strcmp(task->name, expected_task_name) == 0); xbt_free(expected_task_name); MSG_task_destroy(task); - return 0; -} - -/** @brief Migrate the VM to the given host. - * @ingroup msg_VMs - * - * FIXME: No migration cost occurs. If you want to simulate this too, you want to use a MSG_task_send() before or after, - * depending on whether you want to do cold or hot migration. - */ -void MSG_vm_migrate(msg_vm_t vm, msg_host_t new_pm) -{ - /* some thoughts: - * - One approach is ... - * We first create a new VM (i.e., destination VM) on the destination physical host. The destination VM will - * receive the state of the source - * VM over network. We will finally destroy the source VM. - * - This behavior is similar to the way of migration in the real world. - * Even before a migration is completed, we will see a destination VM, consuming resources. - * - We have to relocate all processes. The existing process migration code will work for this? - * - The name of the VM is a somewhat unique ID in the code. It is tricky for the destination VM? - * - * - Another one is ... - * We update the information of the given VM to place it to the destination physical host. - * - * The second one would be easier. - */ - - simgrid::s4u::VirtualMachine* typedVm = static_cast(vm); - simgrid::surf::VirtualMachineImpl* pimpl = typedVm->pimpl_vm_; - msg_host_t old_pm = pimpl->getPm(); - - if (old_pm->isOff()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->cname(), old_pm->cname()); - - if (new_pm->isOff()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->cname(), new_pm->cname()); - - if (!MSG_vm_is_running(vm)) - THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->cname()); - - if (typedVm->isMigrating()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->cname()); - - pimpl->isMigrating = true; - - int ret = do_migration(vm, old_pm, new_pm); - if (ret == -1) { - pimpl->isMigrating = false; - THROWF(host_error, 0, "Source host '%s' failed during the migration of VM '%s'.", old_pm->cname(), vm->cname()); - } else if (ret == -2) { - pimpl->isMigrating = false; - THROWF(host_error, 0, "Destination host '%s' failed during the migration of VM '%s'.", new_pm->cname(), - vm->cname()); - } } /** @brief Immediately suspend the execution of all processes within the given VM. @@ -855,10 +813,10 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t new_pm) */ void MSG_vm_suspend(msg_vm_t vm) { - if (MSG_vm_is_migrating(vm)) - THROWF(vm_error, 0, "Cannot suspend VM '%s', which is migrating", vm->cname()); - - simcall_vm_suspend(vm); + smx_actor_t issuer = SIMIX_process_self(); + simgrid::simix::kernelImmediate([vm,issuer]() { + static_cast(vm)->pimpl_vm_->suspend(issuer); + }); XBT_DEBUG("vm_suspend done"); @@ -877,49 +835,7 @@ void MSG_vm_suspend(msg_vm_t vm) */ void MSG_vm_resume(msg_vm_t vm) { - simcall_vm_resume(vm); - - if (TRACE_msg_vm_is_enabled()) { - container_t vm_container = PJ_container_get(vm->cname()); - type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); - new_pajePopState(MSG_get_clock(), vm_container, type); - } -} - - -/** @brief Immediately save the execution of all processes within the given VM. - * @ingroup msg_VMs - * - * This function stops the execution of the VM. All the processes on this VM - * will pause. The state of the VM is preserved. We can later resume it again. - * - * FIXME: No suspension cost occurs. If you want to simulate this too, you want to use a \ref MSG_file_write() before - * or after, depending on the exact semantic of VM save to you. - */ -void MSG_vm_save(msg_vm_t vm) -{ - if (MSG_vm_is_migrating(vm)) - THROWF(vm_error, 0, "Cannot save VM '%s', which is migrating.", vm->cname()); - - simcall_vm_save(vm); - - if (TRACE_msg_vm_is_enabled()) { - container_t vm_container = PJ_container_get(vm->cname()); - type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); - val_t value = PJ_value_get_or_new("save", "0 1 0", type); // save is green - new_pajePushState(MSG_get_clock(), vm_container, type, value); - } -} - -/** @brief Restore the execution of the VM. All processes on the VM run again. - * @ingroup msg_VMs - * - * FIXME: No restore cost occurs. If you want to simulate this too, you want to use a \ref MSG_file_read() before or - * after, depending on the exact semantic of VM restore to you. - */ -void MSG_vm_restore(msg_vm_t vm) -{ - simcall_vm_restore(vm); + static_cast(vm)->pimpl_vm_->resume(); if (TRACE_msg_vm_is_enabled()) { container_t vm_container = PJ_container_get(vm->cname()); @@ -933,7 +849,7 @@ void MSG_vm_restore(msg_vm_t vm) */ msg_host_t MSG_vm_get_pm(msg_vm_t vm) { - return static_cast(vm)->pimpl_vm_->getPm(); + return static_cast(vm)->pm(); } /** @brief Set a CPU bound for a given VM. @@ -964,5 +880,6 @@ msg_host_t MSG_vm_get_pm(msg_vm_t vm) */ void MSG_vm_set_bound(msg_vm_t vm, double bound) { - simcall_vm_set_bound(vm, bound); + simgrid::simix::kernelImmediate( + [vm, bound]() { static_cast(vm)->pimpl_vm_->setBound(bound); }); }