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
simplify link events and rename getRootContainer to getRoot
[simgrid.git]
/
src
/
msg
/
msg_vm.cpp
diff --git
a/src/msg/msg_vm.cpp
b/src/msg/msg_vm.cpp
index
6f5c673
..
ba6cbec
100644
(file)
--- a/
src/msg/msg_vm.cpp
+++ b/
src/msg/msg_vm.cpp
@@
-185,11
+185,9
@@
void MSG_vm_start(msg_vm_t vm)
{
vm->start();
if (TRACE_msg_vm_is_enabled()) {
- container_t vm_container = simgrid::instr::Container::byName(vm->getName());
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(vm_container->type_->byName("MSG_VM_STATE"));
+ simgrid::instr::StateType* state = simgrid::instr::Container::byName(vm->getName())->getState("MSG_VM_STATE");
state->addEntityValue("start", "0 0 1"); // start is blue
- state->pushEvent(
MSG_get_clock(), vm_container,
"start");
+ state->pushEvent("start");
}
}
@@
-294,10
+292,8
@@
static int migration_rx_fun(int argc, char *argv[])
counter++;
// start link
- container_t msg = simgrid::instr::Container::byName(vm->getName());
- simgrid::instr::LinkType* link =
- static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_VM_LINK"));
- link->startEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), msg, "M", key);
+ container_t msg = simgrid::instr::Container::byName(vm->getName());
+ simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->startEvent(msg, "M", key);
// destroy existing container of this vm
container_t existing_container = simgrid::instr::Container::byName(vm->getName());
@@
-309,7
+305,7
@@
static int migration_rx_fun(int argc, char *argv[])
// end link
msg = simgrid::instr::Container::byName(vm->getName());
-
link->endEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(),
msg, "M", key);
+
simgrid::instr::Container::getRoot()->getLink("MSG_VM_LINK")->endEvent(
msg, "M", key);
}
// Inform the SRC that the migration has been correctly performed
@@
-767,11
+763,9
@@
void MSG_vm_suspend(msg_vm_t vm)
XBT_DEBUG("vm_suspend done");
if (TRACE_msg_vm_is_enabled()) {
- container_t vm_container = simgrid::instr::Container::byName(vm->getName());
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(vm_container->type_->byName("MSG_VM_STATE"));
+ simgrid::instr::StateType* state = simgrid::instr::Container::byName(vm->getName())->getState("MSG_VM_STATE");
state->addEntityValue("suspend", "1 0 0"); // suspend is red
- state->pushEvent(
MSG_get_clock(), vm_container,
"suspend");
+ state->pushEvent("suspend");
}
}
@@
-784,12
+778,8
@@
void MSG_vm_resume(msg_vm_t vm)
{
vm->pimpl_vm_->resume();
- if (TRACE_msg_vm_is_enabled()) {
- container_t vm_container = simgrid::instr::Container::byName(vm->getName());
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(vm_container->type_->byName("MSG_VM_STATE"));
- state->popEvent(MSG_get_clock(), vm_container);
- }
+ if (TRACE_msg_vm_is_enabled())
+ simgrid::instr::Container::byName(vm->getName())->getState("MSG_VM_STATE")->popEvent();
}
/** @brief Get the physical host of a given VM.