if (TRACE_msg_vm_is_enabled()) {
container_t container = PJ_container_get(vm->getCname());
PJ_container_remove_from_parent(container);
- PJ_container_free(container);
+ delete container;
}
}
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);
}
// 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
container_t existing_container = PJ_container_get(vm->getCname());
PJ_container_remove_from_parent(existing_container);
- PJ_container_free(existing_container);
+ delete existing_container;
// create new container on the new_host location
- PJ_container_new(vm->getCname(), simgrid::instr::INSTR_MSG_VM, PJ_container_get(ms->dst_pm->getCname()));
+ new simgrid::instr::Container(vm->getCname(), simgrid::instr::INSTR_MSG_VM,
+ PJ_container_get(ms->dst_pm->getCname()));
// 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);
}
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);
}
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);
}
}