X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/063ee2aabef6b7ae8f82c39ad7c00f6d2c74f2d5..689067191e467d095a7c7ee340b100469bf6173b:/src/msg/msg_vm.cpp diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 4f725e7084..8772432cc8 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -41,7 +41,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG AP */ void MSG_vm_set_params(msg_vm_t vm, vm_params_t params) { - static_cast(vm)->setParameters(params); + vm->setParameters(params); } /** \ingroup m_vm_management @@ -52,14 +52,13 @@ void MSG_vm_set_params(msg_vm_t vm, vm_params_t params) */ void MSG_vm_get_params(msg_vm_t vm, vm_params_t params) { - static_cast(vm)->parameters(params); + vm->getParameters(params); } /* **** Check state of a VM **** */ static inline int __MSG_vm_is_state(msg_vm_t vm, e_surf_vm_state_t state) { - simgrid::s4u::VirtualMachine* castedVm = static_cast(vm); - return castedVm->pimpl_vm_ != nullptr && castedVm->pimpl_vm_->getState() == state; + return vm->pimpl_vm_ != nullptr && vm->pimpl_vm_->getState() == state; } /** @brief Returns whether the given VM has just created, not running. @@ -83,7 +82,7 @@ int MSG_vm_is_running(msg_vm_t vm) */ int MSG_vm_is_migrating(msg_vm_t vm) { - return static_cast(vm)->isMigrating(); + return vm->isMigrating(); } /** @brief Returns whether the given VM is currently suspended, not running. @@ -110,7 +109,7 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int coreAmount, int rams /* For the moment, intensity_rate is the percentage against the migration bandwidth */ - msg_vm_t vm = MSG_vm_create_multicore(pm, name, coreAmount); + msg_vm_t vm = new simgrid::s4u::VirtualMachine(name, pm, coreAmount); s_vm_params_t params; memset(¶ms, 0, sizeof(params)); params.ramsize = static_cast(ramsize) * 1024 * 1024; @@ -122,7 +121,7 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int coreAmount, int rams params.dp_cap = params.ramsize * 0.9; // assume working set memory is 90% of ramsize XBT_DEBUG("migspeed : %f intensity mem : %d", params.mig_speed, dp_intensity); - static_cast(vm)->setParameters(¶ms); + vm->setParameters(¶ms); return vm; } @@ -157,20 +156,18 @@ msg_vm_t MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount */ void MSG_vm_destroy(msg_vm_t vm) { - if (MSG_vm_is_migrating(vm)) - THROWF(vm_error, 0, "Cannot destroy VM '%s', which is migrating.", vm->cname()); + if (vm->isMigrating()) + THROWF(vm_error, 0, "Cannot destroy VM '%s', which is migrating.", vm->getCname()); /* First, terminate all processes on the VM if necessary */ if (MSG_vm_is_running(vm)) MSG_vm_shutdown(vm); /* Then, destroy the VM object */ - simgrid::simix::kernelImmediate([vm]() { - vm->destroy(); - }); + simgrid::simix::kernelImmediate([vm]() { vm->destroy(); }); if (TRACE_msg_vm_is_enabled()) { - container_t container = PJ_container_get(vm->cname()); + container_t container = PJ_container_get(vm->getCname()); PJ_container_remove_from_parent(container); PJ_container_free(container); } @@ -186,14 +183,13 @@ void MSG_vm_start(msg_vm_t vm) simgrid::simix::kernelImmediate([vm]() { simgrid::vm::VmHostExt::ensureVmExtInstalled(); - simgrid::s4u::VirtualMachine* typedVM = static_cast(vm); - simgrid::s4u::Host* pm = typedVM->pimpl_vm_->getPm(); + simgrid::s4u::Host* pm = vm->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(); + long vm_ramsize = vm->getRamsize(); if (pm_ramsize && not 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 */ @@ -204,16 +200,16 @@ void MSG_vm_start(msg_vm_t vm) 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()); + vm->getCname(), pm->getCname(), 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->getCname(), vm->getCname()); } } - typedVM->pimpl_vm_->setState(SURF_VM_STATE_RUNNING); + vm->pimpl_vm_->setState(SURF_VM_STATE_RUNNING); }); if (TRACE_msg_vm_is_enabled()) { - container_t vm_container = PJ_container_get(vm->cname()); + container_t vm_container = PJ_container_get(vm->getCname()); 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 PushStateEvent(MSG_get_clock(), vm_container, type, value); @@ -230,9 +226,7 @@ void MSG_vm_start(msg_vm_t vm) void MSG_vm_shutdown(msg_vm_t vm) { smx_actor_t issuer=SIMIX_process_self(); - simgrid::simix::kernelImmediate([vm,issuer]() { - static_cast(vm)->pimpl_vm_->shutdown(issuer); - }); + simgrid::simix::kernelImmediate([vm, issuer]() { 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) @@ -241,17 +235,17 @@ void MSG_vm_shutdown(msg_vm_t vm) static inline char *get_mig_process_tx_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) { - return bprintf("__pr_mig_tx:%s(%s-%s)", vm->cname(), src_pm->cname(), dst_pm->cname()); + return bprintf("__pr_mig_tx:%s(%s-%s)", vm->getCname(), src_pm->getCname(), dst_pm->getCname()); } static inline char *get_mig_process_rx_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) { - return bprintf("__pr_mig_rx:%s(%s-%s)", vm->cname(), src_pm->cname(), dst_pm->cname()); + return bprintf("__pr_mig_rx:%s(%s-%s)", vm->getCname(), src_pm->getCname(), dst_pm->getCname()); } static inline char *get_mig_task_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm, int stage) { - return bprintf("__task_mig_stage%d:%s(%s-%s)", stage, vm->cname(), src_pm->cname(), dst_pm->cname()); + return bprintf("__task_mig_stage%d:%s(%s-%s)", stage, vm->getCname(), src_pm->getCname(), dst_pm->getCname()); } struct migration_session { @@ -300,7 +294,7 @@ static int migration_rx_fun(int argc, char *argv[]) // Copy the reference to the vm (if SRC crashes now, do_migration will free ms) // This is clearly ugly but I (Adrien) need more time to do something cleaner (actually we should copy the whole ms // structure at the beginning and free it at the end of each function) - simgrid::s4u::VirtualMachine* vm = static_cast(ms->vm); + simgrid::s4u::VirtualMachine* vm = ms->vm; msg_host_t dst_pm = ms->dst_pm; // Make sure that we cannot get interrupted between the migrate and the resume to not end in an inconsistent state @@ -317,7 +311,7 @@ static int migration_rx_fun(int argc, char *argv[]) // Now the VM is running on the new host (the migration is completed) (even if the SRC crash) vm->pimpl_vm_->isMigrating = false; - XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", ms->vm->cname(), ms->src_pm->cname(), ms->dst_pm->cname()); + XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", ms->vm->getCname(), ms->src_pm->getCname(), ms->dst_pm->getCname()); if (TRACE_msg_vm_is_enabled()) { static long long int counter = 0; @@ -326,20 +320,20 @@ static int migration_rx_fun(int argc, char *argv[]) counter++; // start link - container_t msg = PJ_container_get(vm->cname()); + container_t msg = PJ_container_get(vm->getCname()); type_t type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); new StartLinkEvent(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->cname()); + container_t existing_container = PJ_container_get(vm->getCname()); 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(ms->dst_pm->cname())); + PJ_container_new(vm->getCname(), INSTR_MSG_VM, PJ_container_get(ms->dst_pm->getCname())); // end link - msg = PJ_container_get(vm->cname()); + msg = PJ_container_get(vm->getCname()); type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); new EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); } @@ -366,16 +360,14 @@ static int migration_rx_fun(int argc, char *argv[]) static void start_dirty_page_tracking(msg_vm_t vm) { - simgrid::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; - - pimpl->dp_enabled = 1; - if (not pimpl->dp_objs) + vm->pimpl_vm_->dp_enabled = 1; + if (not vm->pimpl_vm_->dp_objs) return; char *key = nullptr; xbt_dict_cursor_t cursor = nullptr; dirty_page_t dp = nullptr; - xbt_dict_foreach (pimpl->dp_objs, cursor, key, dp) { + xbt_dict_foreach (vm->pimpl_vm_->dp_objs, cursor, key, dp) { double remaining = MSG_task_get_flops_amount(dp->task); dp->prev_clock = MSG_get_clock(); dp->prev_remaining = remaining; @@ -386,7 +378,7 @@ static void start_dirty_page_tracking(msg_vm_t vm) static void stop_dirty_page_tracking(msg_vm_t vm) { - static_cast(vm)->pimpl_vm_->dp_enabled = 0; + vm->pimpl_vm_->dp_enabled = 0; } static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock) @@ -394,7 +386,7 @@ 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, vm->cname(), computed, + XBT_DEBUG("%s@%s: computed %f ops (remaining %f -> %f) in %f secs (%f -> %f)", key, vm->getCname(), computed, dp->prev_remaining, remaining, duration, dp->prev_clock, clock); return computed; @@ -402,13 +394,12 @@ 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::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; double total = 0; char *key = nullptr; xbt_dict_cursor_t cursor = nullptr; dirty_page_t dp = nullptr; - xbt_dict_foreach (pimpl->dp_objs, cursor, key, dp) { + xbt_dict_foreach (vm->pimpl_vm_->dp_objs, cursor, key, dp) { double remaining = MSG_task_get_flops_amount(dp->task); double clock = MSG_get_clock(); @@ -420,12 +411,12 @@ static double lookup_computed_flop_counts(msg_vm_t vm, int stage_for_fancy_debug dp->prev_clock = clock; } - total += pimpl->dp_updated_by_deleted_tasks; + total += vm->pimpl_vm_->dp_updated_by_deleted_tasks; XBT_DEBUG("mig-stage%d.%d: computed %f flop_counts (including %f by deleted tasks)", stage_for_fancy_debug, - stage2_round_for_fancy_debug, total, pimpl->dp_updated_by_deleted_tasks); + stage2_round_for_fancy_debug, total, vm->pimpl_vm_->dp_updated_by_deleted_tasks); - pimpl->dp_updated_by_deleted_tasks = 0; + vm->pimpl_vm_->dp_updated_by_deleted_tasks = 0; return total; } @@ -438,22 +429,21 @@ 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::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; double remaining = MSG_task_get_flops_amount(task); char *key = bprintf("%s-%p", task->name, task); dirty_page_t dp = xbt_new0(s_dirty_page, 1); dp->task = task; - if (pimpl->dp_enabled) { + if (vm->pimpl_vm_->dp_enabled) { dp->prev_clock = MSG_get_clock(); dp->prev_remaining = remaining; } - if (not pimpl->dp_objs) - 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, host->cname(), remaining, pimpl->dp_enabled); + if (not vm->pimpl_vm_->dp_objs) + vm->pimpl_vm_->dp_objs = xbt_dict_new_homogeneous(nullptr); + xbt_assert(xbt_dict_get_or_null(vm->pimpl_vm_->dp_objs, key) == nullptr); + xbt_dict_set(vm->pimpl_vm_->dp_objs, key, dp, nullptr); + XBT_DEBUG("add %s on %s (remaining %f, dp_enabled %d)", key, host->getCname(), remaining, vm->pimpl_vm_->dp_enabled); xbt_free(key); } @@ -463,27 +453,26 @@ 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::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); + dirty_page_t dp = (dirty_page_t)(vm->pimpl_vm_->dp_objs ? xbt_dict_get_or_null(vm->pimpl_vm_->dp_objs, key) : NULL); xbt_assert(dp->task == task); /* If we are in the middle of dirty page tracking, we record how much computation has been done until now, and keep * the information for the lookup_() function that will called soon. */ - if (pimpl->dp_enabled) { + if (vm->pimpl_vm_->dp_enabled) { double remaining = MSG_task_get_flops_amount(task); double clock = MSG_get_clock(); // double updated = calc_updated_pages(key, host, dp, remaining, clock); - double updated = get_computed(key, host, dp, remaining, clock); + double updated = get_computed(key, vm, dp, remaining, clock); // was host instead of vm - pimpl->dp_updated_by_deleted_tasks += updated; + vm->pimpl_vm_->dp_updated_by_deleted_tasks += updated; } - if (pimpl->dp_objs) - xbt_dict_remove(pimpl->dp_objs, key); + if (vm->pimpl_vm_->dp_objs) + xbt_dict_remove(vm->pimpl_vm_->dp_objs, key); xbt_free(dp); - XBT_DEBUG("del %s on %s", key, host->cname()); + XBT_DEBUG("del %s on %s", key, host->getCname()); xbt_free(key); } @@ -514,13 +503,13 @@ static sg_size_t send_migration_data(msg_vm_t vm, msg_host_t src_pm, msg_host_t /* FIXME: why try-and-catch is used here? */ if(ret == MSG_HOST_FAILURE){ - XBT_DEBUG("SRC host failed during migration of %s (stage %d)", vm->cname(), stage); + XBT_DEBUG("SRC host failed during migration of %s (stage %d)", vm->getCname(), stage); MSG_task_destroy(task); - THROWF(host_error, 0, "SRC host failed during migration of %s (stage %d)", vm->cname(), stage); + THROWF(host_error, 0, "SRC host failed during migration of %s (stage %d)", vm->getCname(), stage); }else if(ret == MSG_TRANSFER_FAILURE){ - XBT_DEBUG("DST host failed during migration of %s (stage %d)", vm->cname(), stage); + XBT_DEBUG("DST host failed during migration of %s (stage %d)", vm->getCname(), stage); MSG_task_destroy(task); - THROWF(host_error, 0, "DST host failed during migration of %s (stage %d)", vm->cname(), stage); + THROWF(host_error, 0, "DST host failed during migration of %s (stage %d)", vm->getCname(), stage); } double clock_end = MSG_get_clock(); @@ -557,9 +546,9 @@ static int migration_tx_fun(int argc, char *argv[]) // Note that the ms structure has been allocated in do_migration and hence should be freed in the same function ;) migration_session *ms = static_cast(MSG_process_get_data(MSG_process_self())); - double host_speed = MSG_host_get_speed(MSG_vm_get_pm(ms->vm)); + double host_speed = ms->vm->pimpl_vm_->getPm()->getSpeed(); s_vm_params_t params; - static_cast(ms->vm)->parameters(¶ms); + ms->vm->getParameters(¶ms); const sg_size_t ramsize = params.ramsize; const sg_size_t devsize = params.devsize; const int skip_stage1 = params.skip_stage1; @@ -695,7 +684,7 @@ 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); - simgrid::vm::VirtualMachineImpl* pimpl = static_cast(ms->vm)->pimpl_vm_; + simgrid::vm::VirtualMachineImpl* pimpl = 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()); @@ -709,7 +698,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) - static_cast(ms->vm)->pimpl_vm_->resume(); + ms->vm->pimpl_vm_->resume(); return 0; } @@ -741,20 +730,18 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) * 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(); + msg_host_t src_pm = vm->pimpl_vm_->getPm(); if (src_pm->isOff()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->cname(), src_pm->cname()); + THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->getCname(), src_pm->getCname()); if (dst_pm->isOff()) - THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->cname(), dst_pm->cname()); + THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->getCname(), dst_pm->getCname()); if (not 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()); + THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->getCname()); + if (vm->isMigrating()) + THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->getCname()); - pimpl->isMigrating = true; + vm->pimpl_vm_->isMigrating = true; struct migration_session *ms = xbt_new(struct migration_session, 1); ms->vm = vm; @@ -763,8 +750,8 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) /* We have two mailboxes. mbox is used to transfer migration data between source and destination PMs. mbox_ctl is used * to detect the completion of a migration. The names of these mailboxes must not conflict with others. */ - ms->mbox_ctl = bprintf("__mbox_mig_ctl:%s(%s-%s)", vm->cname(), src_pm->cname(), dst_pm->cname()); - ms->mbox = bprintf("__mbox_mig_src_dst:%s(%s-%s)", vm->cname(), src_pm->cname(), dst_pm->cname()); + ms->mbox_ctl = bprintf("__mbox_mig_ctl:%s(%s-%s)", vm->getCname(), src_pm->getCname(), dst_pm->getCname()); + ms->mbox = bprintf("__mbox_mig_src_dst:%s(%s-%s)", vm->getCname(), src_pm->getCname(), dst_pm->getCname()); char *pr_rx_name = get_mig_process_rx_name(vm, src_pm, dst_pm); char *pr_tx_name = get_mig_process_tx_name(vm, src_pm, dst_pm); @@ -784,7 +771,7 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) msg_task_t task = nullptr; msg_error_t ret = MSG_task_receive(&task, ms->mbox_ctl); - pimpl->isMigrating = false; + vm->pimpl_vm_->isMigrating = false; xbt_free(ms->mbox_ctl); xbt_free(ms->mbox); @@ -796,12 +783,13 @@ void MSG_vm_migrate(msg_vm_t vm, 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 - THROWF(host_error, 0, "Source host '%s' failed during the migration of VM '%s'.", src_pm->cname(), vm->cname()); + THROWF(host_error, 0, "Source host '%s' failed during the migration of VM '%s'.", src_pm->getCname(), + vm->getCname()); } 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)"); - THROWF(host_error, 0, "Destination host '%s' failed during the migration of VM '%s'.", dst_pm->cname(), - vm->cname()); + THROWF(host_error, 0, "Destination host '%s' failed during the migration of VM '%s'.", dst_pm->getCname(), + vm->getCname()); } char* expected_task_name = get_mig_task_name(vm, src_pm, dst_pm, 4); @@ -821,14 +809,12 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) void MSG_vm_suspend(msg_vm_t vm) { smx_actor_t issuer = SIMIX_process_self(); - simgrid::simix::kernelImmediate([vm,issuer]() { - static_cast(vm)->pimpl_vm_->suspend(issuer); - }); + simgrid::simix::kernelImmediate([vm, issuer]() { vm->pimpl_vm_->suspend(issuer); }); XBT_DEBUG("vm_suspend done"); if (TRACE_msg_vm_is_enabled()) { - container_t vm_container = PJ_container_get(vm->cname()); + container_t vm_container = PJ_container_get(vm->getCname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); val_t value = PJ_value_get_or_new("suspend", "1 0 0", type); // suspend is red new PushStateEvent(MSG_get_clock(), vm_container, type, value); @@ -842,10 +828,10 @@ void MSG_vm_suspend(msg_vm_t vm) */ void MSG_vm_resume(msg_vm_t vm) { - static_cast(vm)->pimpl_vm_->resume(); + vm->pimpl_vm_->resume(); if (TRACE_msg_vm_is_enabled()) { - container_t vm_container = PJ_container_get(vm->cname()); + container_t vm_container = PJ_container_get(vm->getCname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); new PopStateEvent(MSG_get_clock(), vm_container, type); } @@ -856,7 +842,7 @@ void MSG_vm_resume(msg_vm_t vm) */ msg_host_t MSG_vm_get_pm(msg_vm_t vm) { - return static_cast(vm)->pm(); + return vm->getPm(); } /** @brief Set a CPU bound for a given VM. @@ -887,8 +873,7 @@ msg_host_t MSG_vm_get_pm(msg_vm_t vm) */ void MSG_vm_set_bound(msg_vm_t vm, double bound) { - simgrid::simix::kernelImmediate( - [vm, bound]() { static_cast(vm)->pimpl_vm_->setBound(bound); }); + simgrid::simix::kernelImmediate([vm, bound]() { vm->pimpl_vm_->setBound(bound); }); } SG_END_DECL()