A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reindent after previous changes
[simgrid.git]
/
src
/
simix
/
smx_vm.cpp
diff --git
a/src/simix/smx_vm.cpp
b/src/simix/smx_vm.cpp
index
6c99ae8
..
1203a51
100644
(file)
--- a/
src/simix/smx_vm.cpp
+++ b/
src/simix/smx_vm.cpp
@@
-14,7
+14,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX Virt
static long host_get_ramsize(sg_host_t vm, int *overcommit)
{
s_vm_params_t params;
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;
if (overcommit)
*overcommit = params.overcommit;
@@
-42,7
+42,7
@@
static int __can_be_started(sg_host_t vm)
}
long total_ramsize_of_vms = 0;
}
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;
{
unsigned int cursor = 0;
sg_host_t another_vm;
@@
-66,9
+66,7
@@
static int __can_be_started(sg_host_t vm)
void SIMIX_vm_start(sg_host_t vm)
{
if (__can_be_started(vm))
void SIMIX_vm_start(sg_host_t vm)
{
if (__can_be_started(vm))
- static_cast<simgrid::surf::VirtualMachine*>(
- vm->extension<simgrid::surf::HostImpl>()
- )->setState(SURF_VM_STATE_RUNNING);
+ static_cast<simgrid::surf::VirtualMachine*>(vm->pimpl_)->setState(SURF_VM_STATE_RUNNING);
else
THROWF(vm_error, 0, "The VM %s cannot be started", vm->name().c_str());
}
else
THROWF(vm_error, 0, "The VM %s cannot be started", vm->name().c_str());
}
@@
-76,9
+74,7
@@
void SIMIX_vm_start(sg_host_t vm)
e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm)
{
e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t vm)
{
- return static_cast<simgrid::surf::VirtualMachine*>(
- vm->extension<simgrid::surf::HostImpl>()
- )->getState();
+ return static_cast<simgrid::surf::VirtualMachine*>(vm->pimpl_)->getState();
}
/**
}
/**
@@
-288,9
+284,7
@@
void SIMIX_vm_shutdown(sg_host_t vm, smx_actor_t issuer)
}
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
}
/* 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>()
- )->setState(SURF_VM_STATE_CREATED);
+ static_cast<simgrid::surf::VirtualMachine*>(vm->pimpl_)->setState(SURF_VM_STATE_CREATED);
}
void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t vm)
}
void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t vm)
@@
-298,12
+292,11
@@
void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t vm)
SIMIX_vm_shutdown(vm, simcall->issuer);
}
SIMIX_vm_shutdown(vm, simcall->issuer);
}
-extern xbt_dict_t host_list; // FIXME:killme don't dupplicate the content of s4u::Host this way
- /**
- * @brief Function to destroy a SIMIX VM host.
- *
- * @param vm the vm host to destroy (a sg_host_t)
- */
+/**
+ * @brief Function to destroy a SIMIX VM host.
+ *
+ * @param vm the vm host to destroy (a sg_host_t)
+ */
void SIMIX_vm_destroy(sg_host_t vm)
{
/* this code basically performs a similar thing like SIMIX_host_destroy() */
void SIMIX_vm_destroy(sg_host_t vm)
{
/* this code basically performs a similar thing like SIMIX_host_destroy() */
@@
-321,6
+314,5
@@
void SIMIX_vm_destroy(sg_host_t vm)
vm->pimpl_cpu = nullptr;
vm->pimpl_netcard = nullptr;
vm->pimpl_cpu = nullptr;
vm->pimpl_netcard = nullptr;
- if (xbt_dict_get_or_null(host_list, vm->name().c_str()))
- xbt_dict_remove(host_list, vm->name().c_str());
+ vm->destroy();
}
}