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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
plugins
/
vm
/
s4u_VirtualMachine.cpp
diff --git
a/src/plugins/vm/s4u_VirtualMachine.cpp
b/src/plugins/vm/s4u_VirtualMachine.cpp
index
97d2749
..
070acd9
100644
(file)
--- a/
src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/
src/plugins/vm/s4u_VirtualMachine.cpp
@@
-13,11
+13,11
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm) : Host(name)
+VirtualMachine::VirtualMachine(const char* name, s4u::Host* pm, int coreAmount)
+ : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, pm, coreAmount))
{
XBT_DEBUG("Create VM %s", name);
{
XBT_DEBUG("Create VM %s", name);
- pimpl_vm_ = new vm::VirtualMachineImpl(this, pm);
/* Currently, a VM uses the network resource of its physical host */
pimpl_netpoint = pm->pimpl_netpoint;
// Create a VCPU for this VM
/* Currently, a VM uses the network resource of its physical host */
pimpl_netpoint = pm->pimpl_netpoint;
// Create a VCPU for this VM
@@
-56,7
+56,7
@@
VirtualMachine::~VirtualMachine()
bool VirtualMachine::isMigrating()
{
bool VirtualMachine::isMigrating()
{
- return pimpl_vm_->isMigrating;
+ return pimpl_vm_
&& pimpl_vm_
->isMigrating;
}
double VirtualMachine::getRamsize()
{
}
double VirtualMachine::getRamsize()
{
@@
-66,6
+66,10
@@
simgrid::s4u::Host* VirtualMachine::pm()
{
return pimpl_vm_->getPm();
}
{
return pimpl_vm_->getPm();
}
+e_surf_vm_state_t VirtualMachine::getState()
+{
+ return pimpl_vm_->getState();
+}
/** @brief Retrieve a copy of the parameters of that VM/PM
* @details The ramsize and overcommit fields are used on the PM too */
/** @brief Retrieve a copy of the parameters of that VM/PM
* @details The ramsize and overcommit fields are used on the PM too */