give a proper constructor/destructor to instr::Container

[simgrid.git] / src / surf / instr_routing.cpp

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 7f31041..1106ad9 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -167,7 +167,7 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
 
   if (PJ_container_get_root() == nullptr){
     PJ_container_alloc ();
-    container_t root = PJ_container_new(id, simgrid::instr::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()) {
@@ -188,7 +188,7 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
 
   if (TRACE_needs_platform()){
     container_t father = currentContainer.back();
-    container_t container = PJ_container_new(id, simgrid::instr::INSTR_AS, father);
+    container_t container = new simgrid::instr::Container(id, simgrid::instr::INSTR_AS, father);
     currentContainer.push_back(container);
   }
 }
@@ -209,7 +209,7 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
   double bandwidth_value = link.bandwidth();
   double latency_value   = link.latency();
 
-  container_t container = PJ_container_new(link.name(), simgrid::instr::INSTR_LINK, father);
+  container_t container = new simgrid::instr::Container(link.name(), simgrid::instr::INSTR_LINK, father);
 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
     simgrid::instr::Type* bandwidth = simgrid::instr::Type::getOrNull("bandwidth", container->type_);
@@ -234,7 +234,7 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
 static void sg_instr_new_host(simgrid::s4u::Host& host)
 {
   container_t father = currentContainer.back();
-  container_t container = PJ_container_new(host.getCname(), simgrid::instr::INSTR_HOST, father);
+  container_t container = new simgrid::instr::Container(host.getCname(), simgrid::instr::INSTR_HOST, father);
 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
     simgrid::instr::Type* speed = simgrid::instr::Type::getOrNull("power", container->type_);
@@ -298,7 +298,7 @@ static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint)
     return;
   if (TRACE_is_enabled() && TRACE_needs_platform()) {
     container_t father = currentContainer.back();
-    PJ_container_new(netpoint->cname(), simgrid::instr::INSTR_ROUTER, father);
+    new simgrid::instr::Container(netpoint->cname(), simgrid::instr::INSTR_ROUTER, father);
   }
 }