X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a79a8e1cab86ccc687cfbc97b01b735acb996f16..35dd4121018e3122bff5ae2b111da429a9740049:/src/surf/instr_routing.cpp

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 3f455449a9..de787accef 100644
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -1,14 +1,15 @@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. 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. */
 
-#include "src/instr/instr_private.h"
+#include "src/instr/instr_private.hpp"
 
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
 #include "src/kernel/routing/NetZoneImpl.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.h"
 #include "xbt/graph.h"
@@ -21,30 +22,29 @@ static std::vector<container_t> currentContainer; /* push and pop, used only in
 static const char *instr_node_name (xbt_node_t node)
 {
   void *data = xbt_graph_node_get_data(node);
-  char *str = (char*)data;
-  return str;
+  return static_cast<char*>(data);
 }
 
 static container_t lowestCommonAncestor (container_t a1, container_t a2)
 {
   //this is only an optimization (since most of a1 and a2 share the same parent)
-  if (a1->father == a2->father) return a1->father;
+  if (a1->father_ == a2->father_)
+    return a1->father_;
 
   //create an array with all ancestors of a1
   std::vector<container_t> ancestors_a1;
-  container_t p;
-  p = a1->father;
+  container_t p = a1->father_;
   while (p){
     ancestors_a1.push_back(p);
-    p = p->father;
+    p = p->father_;
   }
 
   //create an array with all ancestors of a2
   std::vector<container_t> ancestors_a2;
-  p = a2->father;
+  p = a2->father_;
   while (p){
     ancestors_a2.push_back(p);
-    p = p->father;
+    p = p->father_;
   }
 
   //find the lowest ancestor
@@ -65,122 +65,112 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2)
   return p;
 }
 
-static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
+static void linkContainers(container_t src, container_t dst, std::set<std::string>* filter)
 {
   //ignore loopback
-  if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0){
+  if (src->name_ == "__loopback__" || dst->name_ == "__loopback__") {
     XBT_DEBUG ("  linkContainers: ignoring loopback link");
     return;
   }
 
   //find common father
   container_t father = lowestCommonAncestor (src, dst);
-  if (!father){
+  if (not father) {
     xbt_die ("common father unknown, this is a tracing problem");
   }
 
-  if (filter != nullptr){
-    //check if we already register this pair (we only need one direction)
-    char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE];
-    snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name);
-    snprintf (aux2, INSTR_DEFAULT_STR_SIZE, "%s%s", dst->name, src->name);
-    if (xbt_dict_get_or_null (filter, aux1)){
-      XBT_DEBUG ("  linkContainers: already registered %s <-> %s (1)", src->name, dst->name);
-      return;
-    }
-    if (xbt_dict_get_or_null (filter, aux2)){
-      XBT_DEBUG ("  linkContainers: already registered %s <-> %s (2)", dst->name, src->name);
-      return;
-    }
-
-    //ok, not found, register it
-    xbt_dict_set (filter, aux1, xbt_strdup ("1"), nullptr);
-    xbt_dict_set (filter, aux2, xbt_strdup ("1"), nullptr);
+  // check if we already register this pair (we only need one direction)
+  std::string aux1 = src->name_ + dst->name_;
+  std::string aux2 = dst->name_ + src->name_;
+  if (filter->find(aux1) != filter->end()) {
+    XBT_DEBUG("  linkContainers: already registered %s <-> %s (1)", src->name_.c_str(), dst->name_.c_str());
+    return;
+  }
+  if (filter->find(aux2) != filter->end()) {
+    XBT_DEBUG("  linkContainers: already registered %s <-> %s (2)", dst->name_.c_str(), src->name_.c_str());
+    return;
   }
 
+  // ok, not found, register it
+  filter->insert(aux1);
+  filter->insert(aux2);
+
   //declare type
   char link_typename[INSTR_DEFAULT_STR_SIZE];
-  snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s%s-%s%s",
-            father->type->name,
-            src->type->name, src->type->id,
-            dst->type->name, dst->type->id);
-  type_t link_type = PJ_type_get_or_null (link_typename, father->type);
-  if (link_type == nullptr){
-    link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type);
-  }
+  snprintf(link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s%s-%s%s", father->type_->getCname(), src->type_->getCname(),
+           src->type_->getId(), dst->type_->getCname(), dst->type_->getId());
+  simgrid::instr::Type* link_type = father->type_->getChildOrNull(link_typename);
+  if (link_type == nullptr)
+    link_type = father->type_->addLinkType(link_typename, src->type_, dst->type_);
 
   //register EDGE types for triva configuration
-  xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), nullptr);
+  trivaEdgeTypes.insert(link_type->getName());
 
   //create the link
   static long long counter = 0;
 
   char key[INSTR_DEFAULT_STR_SIZE];
-  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
-  new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "topology", key);
-  new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "topology", key);
+  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
+  counter++;
+
+  new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), father, link_type, src, "topology", key);
+  new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), father, link_type, dst, "topology", key);
 
-  XBT_DEBUG ("  linkContainers %s <-> %s", src->name, dst->name);
+  XBT_DEBUG("  linkContainers %s <-> %s", src->name_.c_str(), dst->name_.c_str());
 }
 
-static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, xbt_dict_t filter)
+static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container,
+                                     std::set<std::string>* filter)
 {
-  if (!TRACE_platform_topology()){
+  if (not TRACE_platform_topology()) {
     XBT_DEBUG("Graph extraction disabled by user.");
     return;
   }
-  XBT_DEBUG("Graph extraction for NetZone = %s", netzone->name());
-  if (!xbt_dict_is_empty(netzone->children())) {
-    xbt_dict_cursor_t cursor = nullptr;
-    NetZone_t nz_son;
-    char *child_name;
+  XBT_DEBUG("Graph extraction for NetZone = %s", netzone->getCname());
+  if (not netzone->getChildren()->empty()) {
     //bottom-up recursion
-    xbt_dict_foreach (netzone->children(), cursor, child_name, nz_son) {
-      container_t child_container = (container_t)xbt_dict_get(container->children, nz_son->name());
+    for (auto const& nz_son : *netzone->getChildren()) {
+      container_t child_container = container->children_.at(nz_son->getCname());
       recursiveGraphExtraction(nz_son, child_container, filter);
     }
   }
 
-  {
-    xbt_graph_t graph = xbt_graph_new_graph (0, nullptr);
-    xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
-    xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
-    xbt_edge_t edge = nullptr;
+  xbt_graph_t graph = xbt_graph_new_graph (0, nullptr);
+  xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
+  xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
+  xbt_edge_t edge = nullptr;
 
-    xbt_dict_cursor_t cursor = nullptr;
-    char *edge_name;
+  xbt_dict_cursor_t cursor = nullptr;
+  char *edge_name;
 
-    static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->getGraph(graph, nodes, edges);
-    xbt_dict_foreach(edges,cursor,edge_name,edge) {
-        linkContainers(
-          PJ_container_get((const char*) edge->src->data),
-          PJ_container_get((const char*) edge->dst->data), filter);
-    }
-    xbt_dict_free (&nodes);
-    xbt_dict_free (&edges);
-    xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr);
+  static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->getGraph(graph, nodes, edges);
+  xbt_dict_foreach(edges,cursor,edge_name,edge) {
+    linkContainers(simgrid::instr::Container::byName(static_cast<const char*>(edge->src->data)),
+                   simgrid::instr::Container::byName(static_cast<const char*>(edge->dst->data)), filter);
   }
+  xbt_dict_free (&nodes);
+  xbt_dict_free (&edges);
+  xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr);
 }
 
 /*
  * Callbacks
  */
-void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS)
+static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
 {
-  const char*id = AS->id;
+  std::string id = netzone.getName();
 
   if (PJ_container_get_root() == nullptr){
-    PJ_container_alloc ();
-    PJ_type_alloc();
-    container_t root = PJ_container_new (id, INSTR_AS, nullptr);
+    container_t root = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, nullptr);
     PJ_container_set_root (root);
 
     if (TRACE_smpi_is_enabled()) {
-      type_t mpi = PJ_type_get_or_null ("MPI", root->type);
+      simgrid::instr::Type* mpi = root->type_->getChildOrNull("MPI");
       if (mpi == nullptr){
-        mpi = PJ_type_container_new("MPI", root->type);
-        if (!TRACE_smpi_is_grouped()) PJ_type_state_new ("MPI_STATE", mpi);
-        PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);
+        mpi = simgrid::instr::Type::containerNew("MPI", root->type_);
+        if (not TRACE_smpi_is_grouped())
+          mpi->addStateType("MPI_STATE");
+        PJ_type_get_root()->addLinkType("MPI_LINK", mpi, mpi);
       }
     }
 
@@ -192,174 +182,155 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS)
 
   if (TRACE_needs_platform()){
     container_t father = currentContainer.back();
-    container_t container = PJ_container_new (id, INSTR_AS, father);
+    container_t container = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, father);
     currentContainer.push_back(container);
   }
 }
 
-void sg_instr_AS_end()
+static void sg_instr_AS_end(simgrid::s4u::NetZone& /*netzone*/)
 {
   if (TRACE_needs_platform()){
     currentContainer.pop_back();
   }
 }
 
-static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
+static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
 {
+  if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback?
+    return;
   container_t father = currentContainer.back();
 
-  double bandwidth_value = link->bandwidth;
-  double latency_value = link->latency;
-  std::vector<std::string> links_to_create;
-
-  if (link->policy == SURF_LINK_FULLDUPLEX){
-    std::string id (link->id);
-    std::string up = id + "_UP";
-    std::string down = id + "_DOWN";
-    links_to_create.push_back(up);
-    links_to_create.push_back(down);
-  }else{
-    links_to_create.push_back(link->id);
-  }
+  double bandwidth_value = link.bandwidth();
+  double latency_value   = link.latency();
 
-  for (auto link_name: links_to_create){
-    container_t container = PJ_container_new (link_name.c_str(), INSTR_LINK, father);
+  container_t container = new simgrid::instr::Container(link.name(), simgrid::instr::INSTR_LINK, father);
 
-    if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) {
-      type_t bandwidth = PJ_type_get_or_null ("bandwidth", container->type);
-      if (bandwidth == nullptr){
-        bandwidth = PJ_type_variable_new ("bandwidth", nullptr, container->type);
-      }
-      type_t latency = PJ_type_get_or_null ("latency", container->type);
-      if (latency == nullptr){
-        latency = PJ_type_variable_new ("latency", nullptr, container->type);
-      }
-      new_pajeSetVariable (0, container, bandwidth, bandwidth_value);
-      new_pajeSetVariable (0, container, latency, latency_value);
-    }
-    if (TRACE_uncategorized()){
-      type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", container->type);
-      if (bandwidth_used == nullptr){
-        PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", container->type);
-      }
-    }
+  if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
+    simgrid::instr::Type* bandwidth = container->type_->getChildOrNull("bandwidth");
+    if (bandwidth == nullptr)
+      bandwidth                   = container->type_->addVariableType("bandwidth", "");
+    simgrid::instr::Type* latency = container->type_->getChildOrNull("latency");
+    if (latency == nullptr)
+      latency = container->type_->addVariableType("latency", "");
+    new simgrid::instr::SetVariableEvent(0, container, bandwidth, bandwidth_value);
+    new simgrid::instr::SetVariableEvent(0, container, latency, latency_value);
+  }
+  if (TRACE_uncategorized()) {
+    simgrid::instr::Type* bandwidth_used = container->type_->getChildOrNull("bandwidth_used");
+    if (bandwidth_used == nullptr)
+      container->type_->addVariableType("bandwidth_used", "0.5 0.5 0.5");
   }
 }
 
-void sg_instr_new_host(simgrid::s4u::Host& host)
+static void sg_instr_new_host(simgrid::s4u::Host& host)
 {
   container_t father = currentContainer.back();
-  container_t container = PJ_container_new(host.cname(), INSTR_HOST, father);
+  container_t container = new simgrid::instr::Container(host.getCname(), simgrid::instr::INSTR_HOST, father);
 
-  if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) {
-    type_t speed = PJ_type_get_or_null ("power", container->type);
+  if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
+    simgrid::instr::Type* speed = container->type_->getChildOrNull("power");
     if (speed == nullptr){
-      speed = PJ_type_variable_new ("power", nullptr, container->type);
+      speed = container->type_->addVariableType("power", "");
     }
 
-    double current_speed_state = host.getPstateSpeedCurrent();
-    new_pajeSetVariable (0, container, speed, current_speed_state);
+    double current_speed_state = host.getSpeed();
+    new simgrid::instr::SetVariableEvent(0, container, speed, current_speed_state);
   }
   if (TRACE_uncategorized()){
-    type_t speed_used = PJ_type_get_or_null ("power_used", container->type);
+    simgrid::instr::Type* speed_used = container->type_->getChildOrNull("power_used");
     if (speed_used == nullptr){
-      PJ_type_variable_new ("power_used", "0.5 0.5 0.5", container->type);
+      container->type_->addVariableType("power_used", "0.5 0.5 0.5");
     }
   }
 
   if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){
-    type_t mpi = PJ_type_get_or_null ("MPI", container->type);
+    simgrid::instr::Type* mpi = container->type_->getChildOrNull("MPI");
     if (mpi == nullptr){
-      mpi = PJ_type_container_new("MPI", container->type);
-      PJ_type_state_new ("MPI_STATE", mpi);
+      mpi = simgrid::instr::Type::containerNew("MPI", container->type_);
+      mpi->addStateType("MPI_STATE");
     }
   }
 
   if (TRACE_msg_process_is_enabled()) {
-    type_t msg_process = PJ_type_get_or_null ("MSG_PROCESS", container->type);
+    simgrid::instr::Type* msg_process = container->type_->getChildOrNull("MSG_PROCESS");
     if (msg_process == nullptr){
-      msg_process = PJ_type_container_new("MSG_PROCESS", container->type);
-      type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
-      PJ_value_new ("suspend", "1 0 1", state);
-      PJ_value_new ("sleep", "1 1 0", state);
-      PJ_value_new ("receive", "1 0 0", state);
-      PJ_value_new ("send", "0 0 1", state);
-      PJ_value_new ("task_execute", "0 1 1", state);
-      PJ_type_link_new ("MSG_PROCESS_LINK", PJ_type_get_root(), msg_process, msg_process);
-      PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process);
+      msg_process                 = simgrid::instr::Type::containerNew("MSG_PROCESS", container->type_);
+      simgrid::instr::Type* state = msg_process->addStateType("MSG_PROCESS_STATE");
+      simgrid::instr::Value::byNameOrCreate("suspend", "1 0 1", state);
+      simgrid::instr::Value::byNameOrCreate("sleep", "1 1 0", state);
+      simgrid::instr::Value::byNameOrCreate("receive", "1 0 0", state);
+      simgrid::instr::Value::byNameOrCreate("send", "0 0 1", state);
+      simgrid::instr::Value::byNameOrCreate("task_execute", "0 1 1", state);
+      PJ_type_get_root()->addLinkType("MSG_PROCESS_LINK", msg_process, msg_process);
+      PJ_type_get_root()->addLinkType("MSG_PROCESS_TASK_LINK", msg_process, msg_process);
     }
   }
 
   if (TRACE_msg_vm_is_enabled()) {
-    type_t msg_vm = PJ_type_get_or_null ("MSG_VM", container->type);
+    simgrid::instr::Type* msg_vm = container->type_->getChildOrNull("MSG_VM");
     if (msg_vm == nullptr){
-      msg_vm = PJ_type_container_new("MSG_VM", container->type);
-      type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm);
-      PJ_value_new ("suspend", "1 0 1", state);
-      PJ_value_new ("sleep", "1 1 0", state);
-      PJ_value_new ("receive", "1 0 0", state);
-      PJ_value_new ("send", "0 0 1", state);
-      PJ_value_new ("task_execute", "0 1 1", state);
-      PJ_type_link_new ("MSG_VM_LINK", PJ_type_get_root(), msg_vm, msg_vm);
-      PJ_type_link_new ("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm);
+      msg_vm                      = simgrid::instr::Type::containerNew("MSG_VM", container->type_);
+      simgrid::instr::Type* state = msg_vm->addStateType("MSG_VM_STATE");
+      simgrid::instr::Value::byNameOrCreate("suspend", "1 0 1", state);
+      simgrid::instr::Value::byNameOrCreate("sleep", "1 1 0", state);
+      simgrid::instr::Value::byNameOrCreate("receive", "1 0 0", state);
+      simgrid::instr::Value::byNameOrCreate("send", "0 0 1", state);
+      simgrid::instr::Value::byNameOrCreate("task_execute", "0 1 1", state);
+      PJ_type_get_root()->addLinkType("MSG_VM_LINK", msg_vm, msg_vm);
+      PJ_type_get_root()->addLinkType("MSG_VM_PROCESS_LINK", msg_vm, msg_vm);
     }
   }
-
 }
 
-void sg_instr_new_router(sg_platf_router_cbarg_t router)
+static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint)
 {
-  container_t father = currentContainer.back();
-  PJ_container_new (router->id, INSTR_ROUTER, father);
+  if (not netpoint->isRouter())
+    return;
+  if (TRACE_is_enabled() && TRACE_needs_platform()) {
+    container_t father = currentContainer.back();
+    new simgrid::instr::Container(netpoint->cname(), simgrid::instr::INSTR_ROUTER, father);
+  }
 }
 
 static void instr_routing_parse_end_platform ()
 {
   currentContainer.clear();
-  xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
+  std::set<std::string>* filter = new std::set<std::string>;
   XBT_DEBUG ("Starting graph extraction.");
-  recursiveGraphExtraction (simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root(), filter);
+  recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), PJ_container_get_root(), filter);
   XBT_DEBUG ("Graph extraction finished.");
-  xbt_dict_free(&filter);
+  delete filter;
   platform_created = 1;
-  TRACE_paje_dump_buffer(1);
+  TRACE_paje_dump_buffer(true);
 }
 
 void instr_routing_define_callbacks ()
 {
-  if (!TRACE_is_enabled()) return;
-  //always need the call backs to ASes (we need only the root AS),
-  //to create the rootContainer and the rootType properly
-  if (!TRACE_needs_platform()) return;
-  simgrid::surf::on_link.connect(instr_routing_parse_start_link);
-  simgrid::surf::on_postparse.connect(instr_routing_parse_end_platform);
+  // always need the callbacks to ASes (we need only the root AS), to create the rootContainer and the rootType properly
+  if (not TRACE_is_enabled())
+    return;
+  if (TRACE_needs_platform()) {
+    simgrid::s4u::Link::onCreation.connect(instr_routing_parse_start_link);
+    simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform);
+    simgrid::s4u::Host::onCreation.connect(sg_instr_new_host);
+  }
+  simgrid::s4u::NetZone::onCreation.connect(sg_instr_AS_begin);
+  simgrid::s4u::NetZone::onSeal.connect(sg_instr_AS_end);
+  simgrid::kernel::routing::NetPoint::onCreation.connect(&sg_instr_new_router);
 }
-
 /*
  * user categories support
  */
-static void recursiveNewVariableType (const char *new_typename, const char *color, type_t root)
+static void recursiveNewVariableType(const char* new_typename, const char* color, simgrid::instr::Type* root)
 {
-  if (!strcmp (root->name, "HOST")){
-    char tnstr[INSTR_DEFAULT_STR_SIZE];
-    snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
-    PJ_type_variable_new (tnstr, color, root);
-  }
-  if (!strcmp (root->name, "MSG_VM")){
-    char tnstr[INSTR_DEFAULT_STR_SIZE];
-    snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
-    PJ_type_variable_new (tnstr, color, root);
-  }
- if (!strcmp (root->name, "LINK")){
-    char tnstr[INSTR_DEFAULT_STR_SIZE];
-    snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename);
-    PJ_type_variable_new (tnstr, color, root);
-  }
-  xbt_dict_cursor_t cursor = nullptr;
-  type_t child_type;
-  char *name;
-  xbt_dict_foreach(root->children, cursor, name, child_type) {
-    recursiveNewVariableType (new_typename, color, child_type);
+  if (root->getName() == "HOST" || root->getName() == "MSG_VM")
+    root->addVariableType(std::string("p") + new_typename, color == nullptr ? "" : color);
+
+  if (root->getName() == "LINK")
+    root->addVariableType(std::string("b") + new_typename, color == nullptr ? "" : color);
+
+  for (auto elm : root->children_) {
+    recursiveNewVariableType(new_typename, color == nullptr ? "" : color, elm.second);
   }
 }
 
@@ -368,17 +339,14 @@ void instr_new_variable_type (const char *new_typename, const char *color)
   recursiveNewVariableType (new_typename, color, PJ_type_get_root());
 }
 
-static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root)
+static void recursiveNewUserVariableType(const char* father_type, const char* new_typename, const char* color,
+                                         simgrid::instr::Type* root)
 {
-  if (!strcmp (root->name, father_type)){
-    PJ_type_variable_new (new_typename, color, root);
-  }
-  xbt_dict_cursor_t cursor = nullptr;
-  type_t child_type;
-  char *name;
-  xbt_dict_foreach(root->children, cursor, name, child_type) {
-    recursiveNewUserVariableType (father_type, new_typename, color, child_type);
+  if (root->getName() == father_type) {
+    root->addVariableType(new_typename, color == nullptr ? "" : color);
   }
+  for (auto elm : root->children_)
+    recursiveNewUserVariableType(father_type, new_typename, color, elm.second);
 }
 
 void instr_new_user_variable_type  (const char *father_type, const char *new_typename, const char *color)
@@ -386,17 +354,13 @@ void instr_new_user_variable_type  (const char *father_type, const char *new_typ
   recursiveNewUserVariableType (father_type, new_typename, color, PJ_type_get_root());
 }
 
-static void recursiveNewUserStateType (const char *father_type, const char *new_typename, type_t root)
+static void recursiveNewUserStateType(const char* father_type, const char* new_typename, simgrid::instr::Type* root)
 {
-  if (!strcmp (root->name, father_type)){
-    PJ_type_state_new (new_typename, root);
-  }
-  xbt_dict_cursor_t cursor = nullptr;
-  type_t child_type;
-  char *name;
-  xbt_dict_foreach(root->children, cursor, name, child_type) {
-    recursiveNewUserStateType (father_type, new_typename, child_type);
+  if (root->getName() == father_type) {
+    root->addStateType(new_typename);
   }
+  for (auto elm : root->children_)
+    recursiveNewUserStateType(father_type, new_typename, elm.second);
 }
 
 void instr_new_user_state_type (const char *father_type, const char *new_typename)
@@ -404,17 +368,14 @@ void instr_new_user_state_type (const char *father_type, const char *new_typenam
   recursiveNewUserStateType (father_type, new_typename, PJ_type_get_root());
 }
 
-static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root)
+static void recursiveNewValueForUserStateType(const char* type_name, const char* val, const char* color,
+                                              simgrid::instr::Type* root)
 {
-  if (!strcmp (root->name, type_name)){
-    PJ_value_new (value, color, root);
-  }
-  xbt_dict_cursor_t cursor = nullptr;
-  type_t child_type;
-  char *name;
-  xbt_dict_foreach(root->children, cursor, name, child_type) {
-    recursiveNewValueForUserStateType (type_name, value, color, child_type);
-  }
+  if (root->getName() == type_name)
+    simgrid::instr::Value::byNameOrCreate(val, color, root);
+
+  for (auto elm : root->children_)
+    recursiveNewValueForUserStateType(type_name, val, color, elm.second);
 }
 
 void instr_new_value_for_user_state_type (const char *type_name, const char *value, const char *color)
@@ -429,16 +390,13 @@ int instr_platform_traced ()
 
 #define GRAPHICATOR_SUPPORT_FUNCTIONS
 
-static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, NetZone_t netzone,
+static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone,
                                         container_t container)
 {
-  if (!xbt_dict_is_empty(netzone->children())) {
-    xbt_dict_cursor_t cursor = nullptr;
-    NetZone_t netzone_child;
-    char *child_name;
+  if (not netzone->getChildren()->empty()) {
     //bottom-up recursion
-    xbt_dict_foreach (netzone->children(), cursor, child_name, netzone_child) {
-      container_t child_container = (container_t)xbt_dict_get(container->children, netzone_child->name());
+    for (auto const& netzone_child : *netzone->getChildren()) {
+      container_t child_container = container->children_.at(netzone_child->getCname());
       recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
     }
   }
@@ -451,7 +409,8 @@ xbt_graph_t instr_routing_platform_graph ()
   xbt_graph_t ret = xbt_graph_new_graph (0, nullptr);
   xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
   xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
-  recursiveXBTGraphExtraction (ret, nodes, edges, simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root());
+  recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(),
+                              PJ_container_get_root());
   xbt_dict_free (&nodes);
   xbt_dict_free (&edges);
   return ret;
@@ -462,9 +421,8 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi
   unsigned int cursor = 0;
   xbt_node_t node = nullptr;
   xbt_edge_t edge = nullptr;
-  FILE *file = nullptr;
 
-  file = fopen(filename, "w");
+  FILE *file = fopen(filename, "w");
   xbt_assert(file, "Failed to open %s \n", filename);
 
   if (g->directed)
@@ -475,8 +433,7 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi
   fprintf(file, "  graph [overlap=scale]\n");
 
   fprintf(file, "  node [shape=box, style=filled]\n");
-  fprintf(file,
-          "  node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
+  fprintf(file, "  node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
 
   xbt_dynar_foreach(g->nodes, cursor, node) {
     fprintf(file, "  \"%s\";\n", instr_node_name(node));
@@ -491,5 +448,4 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi
   }
   fprintf(file, "}\n");
   fclose(file);
-
 }