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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_vm.cpp
diff --git
a/src/msg/msg_vm.cpp
b/src/msg/msg_vm.cpp
index
126d3d8
..
a18f43c
100644
(file)
--- a/
src/msg/msg_vm.cpp
+++ b/
src/msg/msg_vm.cpp
@@
-185,10
+185,10
@@
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::Type*
typ
e = vm_container->type_->byName("MSG_VM_STATE");
- s
imgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("start", "0 0 1", type
); // start is blue
- new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container,
type, val
);
+ container_t vm_container
= simgrid::instr::Container::byName(vm->getName());
+ simgrid::instr::Type*
stat
e = vm_container->type_->byName("MSG_VM_STATE");
+ s
tate->addEntityValue("start", "0 0 1"
); // start is blue
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container,
state, state->getEntityValue("start")
);
}
}
@@
-289,14
+289,14
@@
static int migration_rx_fun(int argc, char *argv[])
if (TRACE_msg_vm_is_enabled()) {
static long long int counter = 0;
- char key[INSTR_DEFAULT_STR_SIZE];
- snprintf(key, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
+ std::string key = std::to_string(counter);
counter++;
// start link
container_t msg = simgrid::instr::Container::byName(vm->getName());
simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MSG_VM_LINK");
- new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ new simgrid::instr::StartLinkEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), type, msg, "M",
+ key);
// destroy existing container of this vm
container_t existing_container = simgrid::instr::Container::byName(vm->getName());
@@
-304,13
+304,13
@@
static int migration_rx_fun(int argc, char *argv[])
delete existing_container;
// create new container on the new_host location
- new simgrid::instr::Container(vm->getCname(), simgrid::instr::INSTR_MSG_VM,
- simgrid::instr::Container::byName(ms->dst_pm->getName()));
+ new simgrid::instr::Container(vm->getCname(), "MSG_VM", simgrid::instr::Container::byName(ms->dst_pm->getName()));
// end link
msg = simgrid::instr::Container::byName(vm->getName());
type = simgrid::instr::Type::getRootType()->byName("MSG_VM_LINK");
- new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ new simgrid::instr::EndLinkEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), type, msg, "M",
+ key);
}
// Inform the SRC that the migration has been correctly performed
@@
-768,10
+768,10
@@
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::Type*
typ
e = vm_container->type_->byName("MSG_VM_STATE");
- s
imgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("suspend", "1 0 0", type
); // suspend is red
- new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container,
type, val
);
+ container_t vm_container
= simgrid::instr::Container::byName(vm->getName());
+ simgrid::instr::Type*
stat
e = vm_container->type_->byName("MSG_VM_STATE");
+ s
tate->addEntityValue("suspend", "1 0 0"
); // suspend is red
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container,
state, state->getEntityValue("suspend")
);
}
}