Continue to reorganize instr

[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 f5f7708..3dc3f33 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -156,9 +156,9 @@ void TRACE_smpi_init(int rank)
 
   container_t father;
   if (TRACE_smpi_is_grouped()){
-    father = simgrid::instr::Container::byName(sg_host_self_get_name());
+    father = simgrid::instr::Container::byNameOrNull(sg_host_self_get_name());
   }else{
-    father = PJ_container_get_root ();
+    father = simgrid::instr::Container::getRootContainer();
   }
   xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __FUNCTION__);
 #if HAVE_PAPI
@@ -198,11 +198,10 @@ void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data
   }
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
   const char *color = instr_find_color (operation);
-  type->addEntityValue(operation, color);
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, type, type->getEntityValue(operation),
-                                     static_cast<void*>(extra));
+  state->addEntityValue(operation, color);
+  state->pushEvent(SIMIX_get_clock(), container, operation, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_collective_out(int rank, const char *operation)
@@ -211,9 +210,8 @@ void TRACE_smpi_collective_out(int rank, const char *operation)
     return;
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-
-  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+  state->popEvent(SIMIX_get_clock(), container);
 }
 
 void TRACE_smpi_computing_init(int rank)
@@ -223,9 +221,9 @@ void TRACE_smpi_computing_init(int rank)
    return;
 
  container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
- 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"));
+ simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+ state->addEntityValue("computing", instr_find_color("computing"));
+ state->pushEvent(SIMIX_get_clock(), container, "computing");
 }
 
 void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
@@ -237,10 +235,9 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
   }
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  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));
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+  state->addEntityValue("computing");
+  state->pushEvent(SIMIX_get_clock(), container, "computing", static_cast<void*>(extra));
 }
 
 void TRACE_smpi_computing_out(int rank)
@@ -249,8 +246,8 @@ void TRACE_smpi_computing_out(int rank)
     return;
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+  state->popEvent(SIMIX_get_clock(), container);
 }
 
 void TRACE_smpi_sleeping_init(int rank)
@@ -260,9 +257,9 @@ void TRACE_smpi_sleeping_init(int rank)
     return;
 
   container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
   state->addEntityValue("sleeping", instr_find_color("sleeping"));
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"));
+  state->pushEvent(SIMIX_get_clock(), container, "sleeping");
 }
 
 void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
@@ -274,10 +271,9 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
   }
 
   container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
   state->addEntityValue("sleeping");
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"),
-                                     static_cast<void*>(extra));
+  state->pushEvent(SIMIX_get_clock(), container, "sleeping", static_cast<void*>(extra));
 }
 
 void TRACE_smpi_sleeping_out(int rank)
@@ -286,8 +282,8 @@ void TRACE_smpi_sleeping_out(int rank)
     return;
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+  state->popEvent(SIMIX_get_clock(), container);
 }
 
 void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
@@ -299,10 +295,9 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
   }
 
   container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
   state->addEntityValue("test");
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("test"),
-                                     static_cast<void*>(extra));
+  state->pushEvent(SIMIX_get_clock(), container, "test", static_cast<void*>(extra));
 }
 
 void TRACE_smpi_testing_out(int rank)
@@ -311,8 +306,8 @@ void TRACE_smpi_testing_out(int rank)
     return;
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+  state->popEvent(SIMIX_get_clock(), container);
 }
 
 void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
@@ -323,10 +318,9 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
   }
 
   container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(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));
+  state->pushEvent(SIMIX_get_clock(), container, operation, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
@@ -335,9 +329,8 @@ void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
     return;
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = container->type_->byName("MPI_STATE");
-
-  new simgrid::instr::PopStateEvent(SIMIX_get_clock(), container, type);
+  simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName("MPI_STATE"));
+  state->popEvent(SIMIX_get_clock(), container);
 }
 
 void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
@@ -348,9 +341,10 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
   std::string key = TRACE_smpi_get_key(src, dst, tag, 1);
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MPI_LINK");
+  simgrid::instr::LinkType* link =
+      static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MPI_LINK"));
   XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
-  new simgrid::instr::StartLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
+  link->startEvent(SIMIX_get_clock(), simgrid::instr::Container::getRootContainer(), container, "PTP", key, size);
 }
 
 void TRACE_smpi_recv(int src, int dst, int tag)
@@ -361,7 +355,8 @@ void TRACE_smpi_recv(int src, int dst, int tag)
   std::string key = TRACE_smpi_get_key(src, dst, tag, 0);
 
   container_t container      = simgrid::instr::Container::byName(smpi_container(dst));
-  simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MPI_LINK");
+  simgrid::instr::LinkType* link =
+      static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MPI_LINK"));
   XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str());
-  new simgrid::instr::EndLinkEvent(SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
+  link->endEvent(SIMIX_get_clock(), simgrid::instr::Container::getRootContainer(), container, "PTP", key);
 }