static long host_get_ramsize(sg_host_t vm, int *overcommit)
{
s_vm_params_t params;
- vm->extension<simgrid::surf::HostImpl>()->getParams(¶ms);
+ vm->pimpl_->getParams(¶ms);
if (overcommit)
*overcommit = params.overcommit;
}
long total_ramsize_of_vms = 0;
- xbt_dynar_t dyn_vms = pm->extension<simgrid::surf::HostImpl>()->getVms();
+ xbt_dynar_t dyn_vms = pm->pimpl_->getVms();
{
unsigned int cursor = 0;
sg_host_t another_vm;
return 1;
}
-void SIMIX_vm_start(sg_host_t ind_vm)
+void SIMIX_vm_start(sg_host_t vm)
{
- if (__can_be_started(ind_vm))
+ if (__can_be_started(vm))
static_cast<simgrid::surf::VirtualMachine*>(
- ind_vm->extension<simgrid::surf::HostImpl>()
+ vm->pimpl_
)->setState(SURF_VM_STATE_RUNNING);
else
- THROWF(vm_error, 0, "The VM %s cannot be started", sg_host_get_name(ind_vm));
+ THROWF(vm_error, 0, "The VM %s cannot be started", vm->name().c_str());
}
-e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t ind_vm)
+e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm)
{
return static_cast<simgrid::surf::VirtualMachine*>(
- ind_vm->extension<simgrid::surf::HostImpl>()
+ vm->pimpl_
)->getState();
}
*
* @param host the vm host to migrate (a sg_host_t)
*/
-void SIMIX_vm_migrate(sg_host_t ind_vm, sg_host_t ind_dst_pm)
+void SIMIX_vm_migrate(sg_host_t vm, sg_host_t dst_pm)
{
/* precopy migration makes the VM temporally paused */
- xbt_assert(SIMIX_vm_get_state(ind_vm) == SURF_VM_STATE_SUSPENDED);
+ xbt_assert(SIMIX_vm_get_state(vm) == SURF_VM_STATE_SUSPENDED);
/* jump to vm_ws_xigrate(). this will update the vm location. */
- surf_vm_migrate(ind_vm, ind_dst_pm);
+ surf_vm_migrate(vm, dst_pm);
}
/**
/* Resume the VM */
smx_actor_t self = SIMIX_process_self();
- SIMIX_vm_resume(vm, self->simcall.issuer);
+ SIMIX_vm_resume(vm, self);
}
/**
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
static_cast<simgrid::surf::VirtualMachine*>(
- vm->extension<simgrid::surf::HostImpl>()
+ vm->pimpl_
)->setState(SURF_VM_STATE_CREATED);
}
/* Don't free these things twice: they are the ones of my physical host */
vm->pimpl_cpu = nullptr;
vm->pimpl_netcard = nullptr;
+
+ vm->destroy();
}