Value is always attached to Type

[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 38e3158..58ee601 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 ();
   }
@@ -199,7 +198,7 @@ void TRACE_smpi_init(int rank)
 #if HAVE_PAPI
   container_t container =
 #endif
-      PJ_container_new(str, INSTR_SMPI, father);
+      new simgrid::instr::Container(str, simgrid::instr::INSTR_SMPI, father);
 #if HAVE_PAPI
   papi_counter_t counters = smpi_process()->papi_counters();
 
@@ -208,8 +207,8 @@ void TRACE_smpi_init(int rank)
      * Check whether this variable already exists or not. Otherwise, it will be created
      * 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);
+    if (s_type::getOrNull(it.first.c_str(), container->type_) == nullptr) {
+      Type::variableNew(it.first.c_str(), "", container->type_);
     }
   }
 #endif
@@ -221,9 +220,9 @@ 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);
-  PJ_container_free (container);
+  container_t container = simgrid::instr::Container::byName(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
+  container->removeFromParent();
+  delete container;
 }
 
 void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra)
@@ -235,11 +234,12 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
   const char *color = instr_find_color (operation);
-  value* val            = value::get_or_new(operation, color, type);
-  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+  type->addEntityValue(operation, color);
+  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue(operation),
+                                     static_cast<void*>(extra));
 }
 
 void TRACE_smpi_collective_out(int rank, const char *operation)
@@ -249,10 +249,10 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
 
-  new PopStateEvent (SIMIX_get_clock(), container, type);
+  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_computing_init(int rank)
@@ -263,10 +263,10 @@ 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);
- Type* type           = PJ_type_get("MPI_STATE", container->type);
- const char* color     = instr_find_color("computing");
- new PushStateEvent(SIMIX_get_clock(), container, type, value::get_or_new("computing", color, type));
+ container_t container      = simgrid::instr::Container::byName(str);
+ simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
+ type->addEntityValue("computing", instr_find_color("computing"));
+ new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue("computing"));
 }
 
 void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
@@ -279,10 +279,11 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  value* val            = value::get_or_new("computing", nullptr, type);
-  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
+  type->addEntityValue("computing");
+  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue("computing"),
+                                     static_cast<void*>(extra));
 }
 
 void TRACE_smpi_computing_out(int rank)
@@ -291,9 +292,9 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  new PopStateEvent (SIMIX_get_clock(), container, type);
+  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);
 }
 
 void TRACE_smpi_sleeping_init(int rank)
@@ -304,11 +305,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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  const char *color = instr_find_color ("sleeping");
-  value* val            = value::get_or_new("sleeping", color, type);
-  new PushStateEvent(SIMIX_get_clock(), container, type, val);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  state->addEntityValue("sleeping", instr_find_color("sleeping"));
+  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"));
 }
 
 void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
@@ -321,10 +321,11 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  value* val            = value::get_or_new("sleeping", nullptr, type);
-  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  state->addEntityValue("sleeping");
+  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"),
+                                     static_cast<void*>(extra));
 }
 
 void TRACE_smpi_sleeping_out(int rank)
@@ -333,9 +334,9 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  new PopStateEvent (SIMIX_get_clock(), container, type);
+  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);
 }
 
 void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
@@ -348,10 +349,11 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  value* val            = value::get_or_new("test", nullptr, type);
-  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  state->addEntityValue("test");
+  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("test"),
+                                     static_cast<void*>(extra));
 }
 
 void TRACE_smpi_testing_out(int rank)
@@ -360,9 +362,9 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  new PopStateEvent (SIMIX_get_clock(), container, type);
+  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);
 }
 
 void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
@@ -374,11 +376,11 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
-  const char *color = instr_find_color (operation);
-  value* val            = value::get_or_new(operation, color, type);
-  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  state->addEntityValue(operation, instr_find_color(operation));
+  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue(operation),
+                                     static_cast<void*>(extra));
 }
 
 void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
@@ -388,10 +390,10 @@ 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);
-  Type* type = PJ_type_get ("MPI_STATE", container->type);
+  container_t container      = simgrid::instr::Container::byName(str);
+  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
 
-  new PopStateEvent (SIMIX_get_clock(), container, type);
+  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
@@ -404,10 +406,10 @@ 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);
-  Type* type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
+  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 StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
+  new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
 }
 
 void TRACE_smpi_recv(int src, int dst, int tag)
@@ -420,8 +422,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);
-  Type* type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
+  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 EndLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
+  new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
 }