- container_t container = new simgrid::instr::HostContainer(host, currentContainer.back());
- container_t root = simgrid::instr::Container::getRoot();
- simgrid::instr::ContainerType* msg_vm = container->type_->getOrCreateContainerType("VM");
- simgrid::instr::StateType* state = msg_vm->getOrCreateStateType("VM_STATE");
- state->addEntityValue("suspend", "1 0 1");
- state->addEntityValue("sleep", "1 1 0");
- state->addEntityValue("receive", "1 0 0");
- state->addEntityValue("send", "0 0 1");
- state->addEntityValue("task_execute", "0 1 1");
- root->type_->getOrCreateLinkType("VM_LINK", msg_vm, msg_vm);
- root->type_->getOrCreateLinkType("VM_ACTOR_LINK", msg_vm, msg_vm);
-}
-
-static void instr_vm_on_start(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->pushEvent("start");
-}
-
-static void instr_vm_on_started(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->popEvent();
-}
-
-static void instr_vm_on_suspend(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->pushEvent("suspend");
-}
-
-static void instr_vm_on_resume(simgrid::s4u::VirtualMachine& vm)
-{
- simgrid::instr::Container::byName(vm.get_name())->getState("VM_STATE")->popEvent();
-}
-
-static void instr_vm_on_destruction(simgrid::s4u::Host& host)
-{
- simgrid::instr::Container::byName(host.get_name())->removeFromParent();
+ container_t container = new simgrid::instr::HostContainer(host, currentContainer.back());
+ container_t root = simgrid::instr::Container::get_root();
+ simgrid::instr::ContainerType* vm = container->type_->by_name_or_create<simgrid::instr::ContainerType>("VM");
+ simgrid::instr::StateType* state = vm->by_name_or_create<simgrid::instr::StateType>("VM_STATE");
+ state->add_entity_value("suspend", "1 0 1");
+ state->add_entity_value("sleep", "1 1 0");
+ state->add_entity_value("receive", "1 0 0");
+ state->add_entity_value("send", "0 0 1");
+ state->add_entity_value("task_execute", "0 1 1");
+ root->type_->by_name_or_create("VM_LINK", vm, vm);
+ root->type_->by_name_or_create("VM_ACTOR_LINK", vm, vm);