merge identical functions

[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..047b9ad 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -108,9 +108,9 @@ static std::unordered_map<smx_actor_t, std::string> process_category;
 static void cleanup_extra_data (instr_extra_data extra){
   if(extra!=nullptr){
     if(extra->sendcounts!=nullptr)
-      xbt_free(extra->sendcounts);
+      delete[] extra->sendcounts;
     if(extra->recvcounts!=nullptr)
-      xbt_free(extra->recvcounts);
+      delete[] extra->recvcounts;
     xbt_free(extra);
   }
 }
@@ -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::getRoot();
   }
   xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __FUNCTION__);
 #if HAVE_PAPI
@@ -190,42 +190,15 @@ void TRACE_smpi_finalize(int rank)
   delete container;
 }
 
-void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data extra)
-{
-  if (not TRACE_smpi_is_enabled()) {
-    cleanup_extra_data(extra);
-    return;
-  }
-
-  container_t container      = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* type = 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));
-}
-
-void TRACE_smpi_collective_out(int rank, const char *operation)
-{
-  if (not TRACE_smpi_is_enabled())
-    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);
-}
-
 void TRACE_smpi_computing_init(int rank)
 {
  //first use, initialize the color in the trace
  if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
    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 = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
+ state->addEntityValue("computing", instr_find_color("computing"));
+ state->pushEvent("computing");
 }
 
 void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
@@ -236,11 +209,9 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
     return;
   }
 
-  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 = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
+  state->addEntityValue("computing");
+  state->pushEvent("computing", static_cast<void*>(extra));
 }
 
 void TRACE_smpi_computing_out(int rank)
@@ -248,9 +219,7 @@ void TRACE_smpi_computing_out(int rank)
   if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_computing())
     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::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
 }
 
 void TRACE_smpi_sleeping_init(int rank)
@@ -259,10 +228,9 @@ void TRACE_smpi_sleeping_init(int rank)
   if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
     return;
 
-  container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
   state->addEntityValue("sleeping", instr_find_color("sleeping"));
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"));
+  state->pushEvent("sleeping");
 }
 
 void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
@@ -273,11 +241,9 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
     return;
   }
 
-  container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
   state->addEntityValue("sleeping");
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("sleeping"),
-                                     static_cast<void*>(extra));
+  state->pushEvent("sleeping", static_cast<void*>(extra));
 }
 
 void TRACE_smpi_sleeping_out(int rank)
@@ -285,9 +251,7 @@ void TRACE_smpi_sleeping_out(int rank)
   if (not TRACE_smpi_is_enabled() || not TRACE_smpi_is_sleeping())
     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::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
 }
 
 void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
@@ -298,46 +262,33 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
     return;
   }
 
-  container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE");
   state->addEntityValue("test");
-  new simgrid::instr::PushStateEvent(SIMIX_get_clock(), container, state, state->getEntityValue("test"),
-                                     static_cast<void*>(extra));
+  state->pushEvent("test", static_cast<void*>(extra));
 }
 
 void TRACE_smpi_testing_out(int rank)
 {
-  if (not TRACE_smpi_is_enabled())
-    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);
+  if (TRACE_smpi_is_enabled())
+    simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
 }
 
-void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
+void TRACE_smpi_comm_in(int rank, const char* operation, instr_extra_data extra)
 {
   if (not TRACE_smpi_is_enabled()) {
     cleanup_extra_data(extra);
     return;
   }
 
-  container_t container       = simgrid::instr::Container::byName(smpi_container(rank));
-  simgrid::instr::Type* state = container->type_->byName("MPI_STATE");
+  simgrid::instr::StateType* state = simgrid::instr::Container::byName(smpi_container(rank))->getState("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(operation, static_cast<void*>(extra));
 }
 
-void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
+void TRACE_smpi_comm_out(int rank)
 {
-  if (not TRACE_smpi_is_enabled())
-    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);
+  if (TRACE_smpi_is_enabled())
+    simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
 }
 
 void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
@@ -347,10 +298,9 @@ 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");
   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);
+  container_t startContainer = simgrid::instr::Container::byName(smpi_container(rank));
+  simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->startEvent(startContainer, "PTP", key, size);
 }
 
 void TRACE_smpi_recv(int src, int dst, int tag)
@@ -360,8 +310,7 @@ 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");
   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);
+  container_t endContainer = simgrid::instr::Container::byName(smpi_container(dst));
+  simgrid::instr::Container::getRoot()->getLink("MPI_LINK")->endEvent(endContainer, "PTP", key);
 }