Merge branch 'master' into actor-priority

[simgrid.git] / src / smpi / internals / instr_smpi.cpp

diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp
index 69ffcb2..2d07348 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -4,7 +4,6 @@
 /* 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 "private.h"
 #include "private.hpp"
 #include <cctype>
 #include <cstdarg>
@@ -190,7 +189,7 @@ void TRACE_smpi_init(int rank)
 
   container_t father;
   if (TRACE_smpi_is_grouped()){
-    father = PJ_container_get(sg_host_self_get_name());
+    father = simgrid::instr::Container::byName(sg_host_self_get_name());
   }else{
     father = PJ_container_get_root ();
   }
@@ -209,7 +208,7 @@ void TRACE_smpi_init(int rank)
      * multiple times but only the last one would be used...
      */
     if (s_type::getOrNull(it.first.c_str(), container->type_) == nullptr) {
-      Type::variableNew(it.first.c_str(), nullptr, container->type_);
+      Type::variableNew(it.first.c_str(), "", container->type_);
     }
   }
 #endif
@@ -221,8 +220,8 @@ void TRACE_smpi_finalize(int rank)
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  container_t container = PJ_container_get(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
-  PJ_container_remove_from_parent (container);
+  container_t container = simgrid::instr::Container::byName(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
+  container->removeFromParent();
   delete container;
 }
 
@@ -235,10 +234,10 @@ void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   const char *color = instr_find_color (operation);
-  simgrid::instr::Value* val = simgrid::instr::Value::get_or_new(operation, color, type);
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(operation, color, type);
   new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
@@ -249,8 +248,8 @@ void TRACE_smpi_collective_out(int rank, const char *operation)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
 
   new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
@@ -263,11 +262,11 @@ void TRACE_smpi_computing_init(int rank)
 
  char str[INSTR_DEFAULT_STR_SIZE];
  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
- container_t container = PJ_container_get(str);
- simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+ container_t container      = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
  const char* color     = instr_find_color("computing");
  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type,
-                                    simgrid::instr::Value::get_or_new("computing", color, type));
+                                    simgrid::instr::Value::byNameOrCreate("computing", color, type));
 }
 
 void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
@@ -280,9 +279,9 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
-  simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("computing", nullptr, type);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("computing", "", type);
   new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
@@ -292,8 +291,8 @@ void TRACE_smpi_computing_out(int rank)
     return;
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
 
@@ -305,10 +304,10 @@ void TRACE_smpi_sleeping_init(int rank)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   const char *color = instr_find_color ("sleeping");
-  simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("sleeping", color, type);
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("sleeping", color, type);
   new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val);
 }
 
@@ -322,9 +321,9 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
-  simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("sleeping", nullptr, type);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("sleeping", "", type);
   new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
@@ -334,8 +333,8 @@ void TRACE_smpi_sleeping_out(int rank)
     return;
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
 
@@ -349,9 +348,9 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
-  simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("test", nullptr, type);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate("test", "", type);
   new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
@@ -361,8 +360,8 @@ void TRACE_smpi_testing_out(int rank)
     return;
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
 
@@ -375,10 +374,10 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   const char *color = instr_find_color (operation);
-  simgrid::instr::Value* val = simgrid::instr::Value::get_or_new(operation, color, type);
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(operation, color, type);
   new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
@@ -389,8 +388,8 @@ void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = container->type_->getChild("MPI_STATE");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
 
   new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
@@ -405,8 +404,8 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = PJ_type_get_root()->getChild("MPI_LINK");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MPI_LINK");
   XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key);
   new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
 }
@@ -421,8 +420,8 @@ void TRACE_smpi_recv(int src, int dst, int tag)
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
-  container_t container = PJ_container_get (str);
-  simgrid::instr::Type* type = PJ_type_get_root()->getChild("MPI_LINK");
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MPI_LINK");
   XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key);
   new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
 }