#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");
/* **** 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<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getState() == state;
}
/** @brief Returns whether the given VM has just created, not running.
// /* Resume the VM */
// simcall_vm_resume(vm);
//
- simcall_vm_migratefrom_resumeto(vm, src_pm, dst_pm);
+ simgrid::simix::kernelImmediate([vm, src_pm, dst_pm]() {
+ /* Update the vm location */
+ SIMIX_vm_migrate(vm, 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<simgrid::surf::VirtualMachineImpl*>(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);
static void start_dirty_page_tracking(msg_vm_t vm)
{
- simgrid::surf::VirtualMachineImpl* pimpl = static_cast<simgrid::surf::VirtualMachineImpl*>(vm->pimpl_);
- pimpl->dp_enabled = 1;
+ static_cast<simgrid::s4u::VirtualMachine*>(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<simgrid::surf::VirtualMachineImpl*>(vm->pimpl_);
- pimpl->dp_enabled = 0;
+ static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->dp_enabled = 0;
}
static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock)
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<simgrid::surf::VirtualMachineImpl*>(vm->pimpl_);
+ simgrid::surf::VirtualMachineImpl* pimpl = static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_;
double total = 0;
char *key = nullptr;