instr: objectifies another method

[simgrid.git] / src / msg / msg_vm.cpp

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index be46bab..c385ac7 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -187,7 +187,7 @@ void MSG_vm_start(msg_vm_t vm)
   vm->start();
   if (TRACE_msg_vm_is_enabled()) {
     container_t vm_container = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type_);
+    simgrid::instr::Type* type = vm_container->type_->getChild("MSG_VM_STATE");
     simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("start", "0 0 1", type); // start is blue
     new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container, type, val);
   }
@@ -296,7 +296,7 @@ static int migration_rx_fun(int argc, char *argv[])
 
     // start link
     container_t msg = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root());
+    simgrid::instr::Type* type = PJ_type_get_root()->getChild("MSG_VM_LINK");
     new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
 
     // destroy existing container of this vm
@@ -310,7 +310,7 @@ static int migration_rx_fun(int argc, char *argv[])
 
     // end link
     msg  = PJ_container_get(vm->getCname());
-    type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root());
+    type = PJ_type_get_root()->getChild("MSG_VM_LINK");
     new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
   }
 
@@ -775,7 +775,7 @@ void MSG_vm_suspend(msg_vm_t vm)
 
   if (TRACE_msg_vm_is_enabled()) {
     container_t vm_container = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type_);
+    simgrid::instr::Type* type = vm_container->type_->getChild("MSG_VM_STATE");
     simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("suspend", "1 0 0", type); // suspend is red
     new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container, type, val);
   }
@@ -792,7 +792,7 @@ void MSG_vm_resume(msg_vm_t vm)
 
   if (TRACE_msg_vm_is_enabled()) {
     container_t vm_container = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type_);
+    simgrid::instr::Type* type = vm_container->type_->getChild("MSG_VM_STATE");
     new simgrid::instr::PopStateEvent(MSG_get_clock(), vm_container, type);
   }
 }