X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a43ef1c628f2962dceb1994099e6a67dc292424e..de32c0ad080a06621f84d9274bf0a3f020c38207:/src/instr/instr_platform.cpp

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 2e13b1a0f1..f0dd78aa8d 100644
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,10 +8,14 @@
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Comm.hpp"
 #include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Exec.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/VirtualMachine.hpp"
+#include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
+#include "src/surf/surf_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.hpp"
 #include "xbt/graph.h"
@@ -99,8 +103,8 @@ static void linkContainers(container_t src, container_t dst, std::set<std::strin
   std::string link_typename = father->type_->get_name() + "-" + src->type_->get_name() +
                               std::to_string(src->type_->get_id()) + "-" + dst->type_->get_name() +
                               std::to_string(dst->type_->get_id());
-  simgrid::instr::LinkType* link = father->type_->getOrCreateLinkType(link_typename, src->type_, dst->type_);
-  link->setCallingContainer(father);
+  simgrid::instr::LinkType* link = father->type_->by_name_or_create(link_typename, src->type_, dst->type_);
+  link->set_calling_container(father);
 
   // register EDGE types for triva configuration
   trivaEdgeTypes.insert(link->get_name());
@@ -111,8 +115,8 @@ static void linkContainers(container_t src, container_t dst, std::set<std::strin
   std::string key = std::to_string(counter);
   counter++;
 
-  link->startEvent(src, "topology", key);
-  link->endEvent(dst, "topology", key);
+  link->start_event(src, "topology", key);
+  link->end_event(dst, "topology", key);
 
   XBT_DEBUG("  linkContainers %s <-> %s", src->get_cname(), dst->get_cname());
 }
@@ -125,10 +129,10 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t
     return;
   }
   XBT_DEBUG("Graph extraction for NetZone = %s", netzone->get_cname());
-  if (not netzone->getChildren()->empty()) {
+  if (not netzone->get_children().empty()) {
     // bottom-up recursion
-    for (auto const& nz_son : *netzone->getChildren()) {
-      container_t child_container = container->children_.at(nz_son->get_cname());
+    for (auto const& nz_son : netzone->get_children()) {
+      container_t child_container = container->children_.at(nz_son->get_name());
       recursiveGraphExtraction(nz_son, child_container, filter);
     }
   }
@@ -137,11 +141,11 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t
   std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>;
   std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>;
 
-  static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->get_graph(graph, nodes, edges);
+  netzone->get_impl()->get_graph(graph, nodes, edges);
   for (auto elm : *edges) {
     xbt_edge_t edge = elm.second;
-    linkContainers(simgrid::instr::Container::byName(static_cast<const char*>(edge->src->data)),
-                   simgrid::instr::Container::byName(static_cast<const char*>(edge->dst->data)), filter);
+    linkContainers(simgrid::instr::Container::by_name(static_cast<const char*>(edge->src->data)),
+                   simgrid::instr::Container::by_name(static_cast<const char*>(edge->dst->data)), filter);
   }
   delete nodes;
   delete edges;
@@ -151,20 +155,21 @@ static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t
 /*
  * Callbacks
  */
-static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone)
+static void instr_netzone_on_creation(simgrid::s4u::NetZone const& netzone)
 {
   std::string id = netzone.get_name();
-  if (simgrid::instr::Container::getRoot() == nullptr) {
+  if (simgrid::instr::Container::get_root() == nullptr) {
     simgrid::instr::NetZoneContainer* root = new simgrid::instr::NetZoneContainer(id, 0, nullptr);
+    xbt_assert(simgrid::instr::Container::get_root() == root);
 
     if (TRACE_smpi_is_enabled()) {
-      simgrid::instr::Type* mpi = root->type_->getOrCreateContainerType("MPI");
+      simgrid::instr::ContainerType* mpi = root->type_->by_name_or_create<simgrid::instr::ContainerType>("MPI");
       if (not TRACE_smpi_is_grouped())
-        mpi->getOrCreateStateType("MPI_STATE");
-      root->type_->getOrCreateLinkType("MPI_LINK", mpi, mpi);
+        mpi->by_name_or_create<simgrid::instr::StateType>("MPI_STATE");
+      root->type_->by_name_or_create("MPI_LINK", mpi, mpi);
       // TODO See if we can move this to the LoadBalancer plugin
-      root->type_->getOrCreateLinkType("MIGRATE_LINK", mpi, mpi);
-      mpi->getOrCreateStateType("MIGRATE_STATE");
+      root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi);
+      mpi->by_name_or_create<simgrid::instr::StateType>("MIGRATE_STATE");
     }
 
     if (TRACE_needs_platform()) {
@@ -180,14 +185,7 @@ static void instr_netzone_on_creation(simgrid::s4u::NetZone& netzone)
   }
 }
 
-static void instr_netzone_on_seal(simgrid::s4u::NetZone& /*netzone*/)
-{
-  if (TRACE_needs_platform()) {
-    currentContainer.pop_back();
-  }
-}
-
-static void instr_link_on_creation(simgrid::s4u::Link& link)
+static void instr_link_on_creation(simgrid::s4u::Link const& link)
 {
   if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback?
     return;
@@ -195,45 +193,86 @@ static void instr_link_on_creation(simgrid::s4u::Link& link)
   container_t container = new simgrid::instr::Container(link.get_name(), "LINK", currentContainer.back());
 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
-    simgrid::instr::VariableType* bandwidth = container->type_->getOrCreateVariableType("bandwidth", "");
-    bandwidth->setCallingContainer(container);
-    bandwidth->setEvent(0, link.bandwidth());
-    simgrid::instr::VariableType* latency = container->type_->getOrCreateVariableType("latency", "");
-    latency->setCallingContainer(container);
-    latency->setEvent(0, link.latency());
+    simgrid::instr::VariableType* bandwidth = container->type_->by_name_or_create("bandwidth", "");
+    bandwidth->set_calling_container(container);
+    bandwidth->set_event(0, link.get_bandwidth());
+    simgrid::instr::VariableType* latency = container->type_->by_name_or_create("latency", "");
+    latency->set_calling_container(container);
+    latency->set_event(0, link.get_latency());
   }
   if (TRACE_uncategorized()) {
-    container->type_->getOrCreateVariableType("bandwidth_used", "0.5 0.5 0.5");
+    container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
   }
 }
 
-static void instr_host_on_creation(simgrid::s4u::Host& host)
+static void instr_host_on_creation(simgrid::s4u::Host const& host)
 {
   container_t container = new simgrid::instr::HostContainer(host, currentContainer.back());
-  container_t root      = simgrid::instr::Container::getRoot();
+  container_t root      = simgrid::instr::Container::get_root();
 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
-    simgrid::instr::VariableType* power = container->type_->getOrCreateVariableType("power", "");
-    power->setCallingContainer(container);
-    power->setEvent(0, host.getSpeed());
+    simgrid::instr::VariableType* speed = container->type_->by_name_or_create("speed", "");
+    speed->set_calling_container(container);
+    speed->set_event(0, host.get_speed());
+
+    simgrid::instr::VariableType* cores = container->type_->by_name_or_create("core_count", "");
+    cores->set_calling_container(container);
+    cores->set_event(0, host.get_core_count());
   }
 
   if (TRACE_uncategorized())
-    container->type_->getOrCreateVariableType("power_used", "0.5 0.5 0.5");
+    container->type_->by_name_or_create("speed_used", "0.5 0.5 0.5");
 
   if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()) {
-    simgrid::instr::ContainerType* mpi = container->type_->getOrCreateContainerType("MPI");
-    mpi->getOrCreateStateType("MPI_STATE");
+    simgrid::instr::ContainerType* mpi = container->type_->by_name_or_create<simgrid::instr::ContainerType>("MPI");
+    mpi->by_name_or_create<simgrid::instr::StateType>("MPI_STATE");
     // TODO See if we can move this to the LoadBalancer plugin
-    root->type_->getOrCreateLinkType("MIGRATE_LINK", mpi, mpi);
-    mpi->getOrCreateStateType("MIGRATE_STATE");
+    root->type_->by_name_or_create("MIGRATE_LINK", mpi, mpi);
+    mpi->by_name_or_create<simgrid::instr::StateType>("MIGRATE_STATE");
   }
 }
 
-static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
+static void instr_host_on_speed_change(simgrid::s4u::Host const& host)
 {
-  if (netpoint->is_router() && TRACE_needs_platform() && TRACE_is_enabled())
-    new simgrid::instr::RouterContainer(netpoint->get_cname(), currentContainer.back());
+  simgrid::instr::Container::by_name(host.get_name())
+      ->get_variable("speed")
+      ->set_event(surf_get_clock(), host.get_core_count() * host.get_available_speed());
+}
+
+static void instr_action_on_state_change(simgrid::kernel::resource::Action const& action,
+                                         simgrid::kernel::resource::Action::State /* previous */)
+{
+  int n = action.get_variable()->get_number_of_constraint();
+
+  for (int i = 0; i < n; i++) {
+    double value = action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i);
+    /* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */
+    simgrid::kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id();
+    simgrid::kernel::resource::Cpu* cpu = dynamic_cast<simgrid::kernel::resource::Cpu*>(resource);
+
+    if (cpu != nullptr)
+      TRACE_surf_resource_set_utilization("HOST", "speed_used", cpu->get_cname(), action.get_category(), value,
+                                          action.get_last_update(), SIMIX_get_clock() - action.get_last_update());
+
+    simgrid::kernel::resource::LinkImpl* link = dynamic_cast<simgrid::kernel::resource::LinkImpl*>(resource);
+
+    if (link != nullptr)
+      TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action.get_category(), value,
+                                          action.get_last_update(), SIMIX_get_clock() - action.get_last_update());
+  }
+}
+
+static void instr_link_on_bandwidth_change(simgrid::s4u::Link const& link)
+{
+  simgrid::instr::Container::by_name(link.get_name())
+      ->get_variable("bandwidth")
+      ->set_event(surf_get_clock(), sg_bandwidth_factor * link.get_bandwidth());
+}
+
+static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint const& netpoint)
+{
+  if (netpoint.is_router())
+    new simgrid::instr::RouterContainer(netpoint.get_name(), currentContainer.back());
 }
 
 static void instr_on_platform_created()
@@ -242,100 +281,68 @@ static void instr_on_platform_created()
   std::set<std::string>* filter = new std::set<std::string>;
   XBT_DEBUG("Starting graph extraction.");
   recursiveGraphExtraction(simgrid::s4u::Engine::get_instance()->get_netzone_root(),
-                           simgrid::instr::Container::getRoot(), filter);
+                           simgrid::instr::Container::get_root(), filter);
   XBT_DEBUG("Graph extraction finished.");
   delete filter;
   TRACE_paje_dump_buffer(true);
 }
 
-static void instr_actor_on_creation(simgrid::s4u::ActorPtr actor)
+static void instr_actor_on_creation(simgrid::s4u::Actor const& actor)
 {
-  container_t root      = simgrid::instr::Container::getRoot();
-  container_t container = simgrid::instr::Container::byName(actor->get_host()->get_name());
-
-  container->createChild(instr_pid(actor.get()), "ACTOR");
-  simgrid::instr::ContainerType* actor_type = container->type_->getOrCreateContainerType("ACTOR");
-  simgrid::instr::StateType* state          = actor_type->getOrCreateStateType("ACTOR_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("ACTOR_LINK", actor_type, actor_type);
-  root->type_->getOrCreateLinkType("ACTOR_TASK_LINK", actor_type, actor_type);
-}
+  container_t root      = simgrid::instr::Container::get_root();
+  container_t container = simgrid::instr::Container::by_name(actor.get_host()->get_name());
 
-static void instr_actor_on_suspend(simgrid::s4u::ActorPtr actor)
-{
-  simgrid::instr::Container::byName(instr_pid(actor.get()))->getState("ACTOR_STATE")->pushEvent("suspend");
-}
+  container->create_child(instr_pid(actor), "ACTOR");
+  simgrid::instr::ContainerType* actor_type =
+      container->type_->by_name_or_create<simgrid::instr::ContainerType>("ACTOR");
+  simgrid::instr::StateType* state = actor_type->by_name_or_create<simgrid::instr::StateType>("ACTOR_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("execute", "0 1 1");
+  root->type_->by_name_or_create("ACTOR_LINK", actor_type, actor_type);
+  root->type_->by_name_or_create("ACTOR_TASK_LINK", actor_type, actor_type);
 
-static void instr_actor_on_resume(simgrid::s4u::ActorPtr actor)
-{
-  simgrid::instr::Container::byName(instr_pid(actor.get()))->getState("ACTOR_STATE")->popEvent();
+  std::string container_name = instr_pid(actor);
+  actor.on_exit([container_name](bool failed) {
+    if (failed)
+      // kill means that this actor no longer exists, let's destroy it
+      simgrid::instr::Container::by_name(container_name)->remove_from_parent();
+  });
 }
 
-static long long int counter = 0;
-
-static void instr_actor_on_migration_start(simgrid::s4u::ActorPtr actor)
+static void instr_actor_on_host_change(simgrid::s4u::Actor const& actor,
+                                       simgrid::s4u::Host const& /*previous_location*/)
 {
-  // start link
-  container_t container = simgrid::instr::Container::byName(instr_pid(actor.get()));
-  simgrid::instr::Container::getRoot()->getLink("ACTOR_LINK")->startEvent(container, "M", std::to_string(counter));
+  static long long int counter = 0;
+  container_t container = simgrid::instr::Container::by_name(instr_pid(actor));
+  simgrid::instr::LinkType* link = simgrid::instr::Container::get_root()->get_link("ACTOR_LINK");
 
+  // start link
+  link->start_event(container, "M", std::to_string(counter));
   // destroy existing container of this process
-  container->removeFromParent();
-}
-
-static void instr_actor_on_migration_end(simgrid::s4u::ActorPtr actor)
-{
+  container->remove_from_parent();
   // create new container on the new_host location
-  simgrid::instr::Container::byName(actor->get_host()->get_name())->createChild(instr_pid(actor.get()), "ACTOR");
+  simgrid::instr::Container::by_name(actor.get_host()->get_name())->create_child(instr_pid(actor), "ACTOR");
   // end link
-  simgrid::instr::Container::getRoot()
-      ->getLink("ACTOR_LINK")
-      ->endEvent(simgrid::instr::Container::byName(instr_pid(actor.get())), "M", std::to_string(counter));
+  link->end_event(simgrid::instr::Container::by_name(instr_pid(actor)), "M", std::to_string(counter));
   counter++;
 }
 
-static void instr_vm_on_creation(simgrid::s4u::Host& host)
-{
-  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)
+static void instr_vm_on_creation(simgrid::s4u::Host const& host)
 {
-  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("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);
 }
 
 void instr_define_callbacks()
@@ -343,94 +350,142 @@ void instr_define_callbacks()
   // always need the callbacks to zones (we need only the root zone), to create the rootContainer and the rootType
   // properly
   if (TRACE_needs_platform()) {
-    simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
-    simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
-    simgrid::s4u::Link::onCreation.connect(instr_link_on_creation);
+    simgrid::s4u::Engine::on_platform_created.connect(instr_on_platform_created);
+    simgrid::s4u::Host::on_creation.connect(instr_host_on_creation);
+    simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
+    simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
+    simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
+    simgrid::s4u::NetZone::on_seal.connect(
+        [](simgrid::s4u::NetZone const& /*netzone*/) { currentContainer.pop_back(); });
+    simgrid::kernel::routing::NetPoint::on_creation.connect(instr_netpoint_on_creation);
   }
-  simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
-  simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal);
-  simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation);
+  simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation);
+
+  simgrid::kernel::resource::CpuAction::on_state_change.connect(instr_action_on_state_change);
+  simgrid::s4u::Link::on_communication_state_change.connect(instr_action_on_state_change);
 
   if (TRACE_actor_is_enabled()) {
     simgrid::s4u::Actor::on_creation.connect(instr_actor_on_creation);
-    simgrid::s4u::Actor::on_suspend.connect(instr_actor_on_suspend);
-    simgrid::s4u::Actor::on_resume.connect(instr_actor_on_resume);
-    simgrid::s4u::Actor::on_migration_start.connect(instr_actor_on_migration_start);
-    simgrid::s4u::Actor::on_migration_end.connect(instr_actor_on_migration_end);
+    simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::Actor const& actor) {
+      auto container = simgrid::instr::Container::by_name_or_null(instr_pid(actor));
+      if (container != nullptr)
+        container->remove_from_parent();
+    });
+    simgrid::s4u::Actor::on_suspend.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("suspend");
+    });
+    simgrid::s4u::Actor::on_resume.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
+    });
+    simgrid::s4u::Actor::on_sleep.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("sleep");
+    });
+    simgrid::s4u::Actor::on_wake_up.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
+    });
+    simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::Actor const& actor, simgrid::s4u::Exec const&) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("execute");
+    });
+    simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Actor const& actor, simgrid::s4u::Exec const&) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
+    });
+    simgrid::s4u::Comm::on_sender_start.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("send");
+    });
+    simgrid::s4u::Comm::on_receiver_start.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->push_event("receive");
+    });
+    simgrid::s4u::Comm::on_completion.connect([](simgrid::s4u::Actor const& actor) {
+      simgrid::instr::Container::by_name(instr_pid(actor))->get_state("ACTOR_STATE")->pop_event();
+    });
+    simgrid::s4u::Actor::on_host_change.connect(instr_actor_on_host_change);
   }
 
   if (TRACE_vm_is_enabled()) {
-    simgrid::s4u::Host::onCreation.connect(instr_vm_on_creation);
-    simgrid::s4u::VirtualMachine::on_start.connect(instr_vm_on_start);
-    simgrid::s4u::VirtualMachine::on_started.connect(instr_vm_on_started);
-    simgrid::s4u::VirtualMachine::on_suspend.connect(instr_vm_on_suspend);
-    simgrid::s4u::VirtualMachine::on_resume.connect(instr_vm_on_resume);
-    simgrid::s4u::Host::onDestruction.connect(instr_vm_on_destruction);
+    simgrid::s4u::Host::on_creation.connect(instr_vm_on_creation);
+    simgrid::s4u::VirtualMachine::on_start.connect([](simgrid::s4u::VirtualMachine const& vm) {
+      simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("start");
+    });
+    simgrid::s4u::VirtualMachine::on_started.connect([](simgrid::s4u::VirtualMachine const& vm) {
+      simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
+    });
+    simgrid::s4u::VirtualMachine::on_suspend.connect([](simgrid::s4u::VirtualMachine const& vm) {
+      simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->push_event("suspend");
+    });
+    simgrid::s4u::VirtualMachine::on_resume.connect([](simgrid::s4u::VirtualMachine const& vm) {
+      simgrid::instr::Container::by_name(vm.get_name())->get_state("VM_STATE")->pop_event();
+    });
+    simgrid::s4u::Host::on_destruction.connect([](simgrid::s4u::Host const& host) {
+      simgrid::instr::Container::by_name(host.get_name())->remove_from_parent();
+    });
   }
 }
 /*
  * user categories support
  */
-static void recursiveNewVariableType(std::string new_typename, std::string color, simgrid::instr::Type* root)
+static void recursiveNewVariableType(const std::string& new_typename, const std::string& color,
+                                     simgrid::instr::Type* root)
 {
   if (root->get_name() == "HOST" || root->get_name() == "VM")
-    root->getOrCreateVariableType(std::string("p") + new_typename, color);
+    root->by_name_or_create(std::string("p") + new_typename, color);
 
   if (root->get_name() == "LINK")
-    root->getOrCreateVariableType(std::string("b") + new_typename, color);
+    root->by_name_or_create(std::string("b") + new_typename, color);
 
-  for (auto elm : root->children_) {
-    recursiveNewVariableType(new_typename, color, elm.second);
+  for (auto const& elm : root->children_) {
+    recursiveNewVariableType(new_typename, color, elm.second.get());
   }
 }
 
-void instr_new_variable_type(std::string new_typename, std::string color)
+void instr_new_variable_type(const std::string& new_typename, const std::string& color)
 {
-  recursiveNewVariableType(new_typename, color, simgrid::instr::Container::getRoot()->type_);
+  recursiveNewVariableType(new_typename, color, simgrid::instr::Container::get_root()->type_);
 }
 
-static void recursiveNewUserVariableType(std::string father_type, std::string new_typename, std::string color,
-                                         simgrid::instr::Type* root)
+static void recursiveNewUserVariableType(const std::string& father_type, const std::string& new_typename,
+                                         const std::string& color, simgrid::instr::Type* root)
 {
   if (root->get_name() == father_type) {
-    root->getOrCreateVariableType(new_typename, color);
+    root->by_name_or_create(new_typename, color);
   }
-  for (auto elm : root->children_)
-    recursiveNewUserVariableType(father_type, new_typename, color, elm.second);
+  for (auto const& elm : root->children_)
+    recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get());
 }
 
-void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color)
+void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
+                                  const std::string& color)
 {
-  recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::getRoot()->type_);
+  recursiveNewUserVariableType(father_type, new_typename, color, simgrid::instr::Container::get_root()->type_);
 }
 
-static void recursiveNewUserStateType(std::string father_type, std::string new_typename, simgrid::instr::Type* root)
+static void recursiveNewUserStateType(const std::string& father_type, const std::string& new_typename,
+                                      simgrid::instr::Type* root)
 {
   if (root->get_name() == father_type)
-    root->getOrCreateStateType(new_typename);
+    root->by_name_or_create<simgrid::instr::StateType>(new_typename);
 
-  for (auto elm : root->children_)
-    recursiveNewUserStateType(father_type, new_typename, elm.second);
+  for (auto const& elm : root->children_)
+    recursiveNewUserStateType(father_type, new_typename, elm.second.get());
 }
 
-void instr_new_user_state_type(std::string father_type, std::string new_typename)
+void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename)
 {
-  recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::getRoot()->type_);
+  recursiveNewUserStateType(father_type, new_typename, simgrid::instr::Container::get_root()->type_);
 }
 
-static void recursiveNewValueForUserStateType(std::string type_name, const char* val, std::string color,
+static void recursiveNewValueForUserStateType(const std::string& type_name, const char* val, const std::string& color,
                                               simgrid::instr::Type* root)
 {
   if (root->get_name() == type_name)
-    static_cast<simgrid::instr::StateType*>(root)->addEntityValue(val, color);
+    static_cast<simgrid::instr::StateType*>(root)->add_entity_value(val, color);
 
-  for (auto elm : root->children_)
-    recursiveNewValueForUserStateType(type_name, val, color, elm.second);
+  for (auto const& elm : root->children_)
+    recursiveNewValueForUserStateType(type_name, val, color, elm.second.get());
 }
 
-void instr_new_value_for_user_state_type(std::string type_name, const char* value, std::string color)
+void instr_new_value_for_user_state_type(const std::string& type_name, const char* value, const std::string& color)
 {
-  recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::getRoot()->type_);
+  recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->type_);
 }
 
 #define GRAPHICATOR_SUPPORT_FUNCTIONS
@@ -439,15 +494,15 @@ static void recursiveXBTGraphExtraction(xbt_graph_t graph, std::map<std::string,
                                         std::map<std::string, xbt_edge_t>* edges, sg_netzone_t netzone,
                                         container_t container)
 {
-  if (not netzone->getChildren()->empty()) {
+  if (not netzone->get_children().empty()) {
     // bottom-up recursion
-    for (auto const& netzone_child : *netzone->getChildren()) {
-      container_t child_container = container->children_.at(netzone_child->get_cname());
+    for (auto const& netzone_child : netzone->get_children()) {
+      container_t child_container = container->children_.at(netzone_child->get_name());
       recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
     }
   }
 
-  static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->get_graph(graph, nodes, edges);
+  netzone->get_impl()->get_graph(graph, nodes, edges);
 }
 
 xbt_graph_t instr_routing_platform_graph()
@@ -456,7 +511,7 @@ xbt_graph_t instr_routing_platform_graph()
   std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>;
   std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>;
   recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::get_instance()->get_netzone_root(),
-                              simgrid::instr::Container::getRoot());
+                              simgrid::instr::Container::get_root());
   delete nodes;
   delete edges;
   return ret;