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
ns3: rename a type for consistency
[simgrid.git]
/
src
/
surf
/
vm_hl13.cpp
diff --git
a/src/surf/vm_hl13.cpp
b/src/surf/vm_hl13.cpp
index
07a646a
..
b17a570
100644
(file)
--- a/
src/surf/vm_hl13.cpp
+++ b/
src/surf/vm_hl13.cpp
@@
-131,11
+131,7
@@
VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos
CpuCas01 *sub_cpu = static_cast<CpuCas01*>(host_PM->pimpl_cpu);
p_cpu = surf_cpu_model_vm->createCpu(host_VM, // the machine hosting the VM
CpuCas01 *sub_cpu = static_cast<CpuCas01*>(host_PM->pimpl_cpu);
p_cpu = surf_cpu_model_vm->createCpu(host_VM, // the machine hosting the VM
- sub_cpu->getSpeedPeakList(), // host->power_peak,
- 1, // host->power_scale,
- NULL, // host->power_trace,
- 1, // host->core_amount,
- NULL); // host->state_trace,
+ sub_cpu->getSpeedPeakList(), 1 /*cores*/);
if (sub_cpu->getPState() != 0)
p_cpu->setPState(sub_cpu->getPState());
if (sub_cpu->getPState() != 0)
p_cpu->setPState(sub_cpu->getPState());
@@
-143,7
+139,7
@@
VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos
/* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
p_action = sub_cpu->execution_start(0);
/* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
p_action = sub_cpu->execution_start(0);
- XBT_
INFO
("Create VM(%s)@PM(%s) with %ld mounted disks",
+ XBT_
VERB
("Create VM(%s)@PM(%s) with %ld mounted disks",
name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
}
name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
}
@@
-182,7
+178,7
@@
void VMHL13::restore()
*/
void VMHL13::migrate(sg_host_t host_dest)
{
*/
void VMHL13::migrate(sg_host_t host_dest)
{
- Host
*surfHost_dst = host_dest->extension<Host
>();
+ Host
Impl *surfHost_dst = host_dest->extension<HostImpl
>();
const char *vm_name = getName();
const char *pm_name_src = p_hostPM->name().c_str();
const char *pm_name_dst = surfHost_dst->getName();
const char *vm_name = getName();
const char *pm_name_src = p_hostPM->name().c_str();
const char *pm_name_dst = surfHost_dst->getName();
@@
-197,9
+193,9
@@
void VMHL13::migrate(sg_host_t host_dest)
/* create a cpu action bound to the pm model at the destination. */
CpuAction *new_cpu_action = static_cast<CpuAction*>(host_dest->pimpl_cpu->execution_start(0));
/* create a cpu action bound to the pm model at the destination. */
CpuAction *new_cpu_action = static_cast<CpuAction*>(host_dest->pimpl_cpu->execution_start(0));
-
e_surf_action_state_t
state = p_action->getState();
- if (state !=
SURF_ACTION_DONE
)
- XBT_CRITICAL("FIXME: may need a proper handling, %d", stat
e
);
+
Action::State
state = p_action->getState();
+ if (state !=
Action::State::done
)
+ XBT_CRITICAL("FIXME: may need a proper handling, %d", stat
ic_cast<int>(state)
);
if (p_action->getRemainsNoUpdate() > 0)
XBT_CRITICAL("FIXME: need copy the state(?), %f", p_action->getRemainsNoUpdate());
if (p_action->getRemainsNoUpdate() > 0)
XBT_CRITICAL("FIXME: need copy the state(?), %f", p_action->getRemainsNoUpdate());