kill dicts in option management

[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 42aa150448a4f9da1e716095e4240198699e83d6..52e6e4bb158da0e7b8b041c536c6d4a588a381fe 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -245,8 +245,8 @@ void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_STATE", container->type);
   const char *color = instr_find_color (operation);
-  val_t value = s_val::PJ_value_get_or_new (operation, color, type);
-  new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast<void*>(extra));
+  value* val            = value::get_or_new(operation, color, type);
+  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_collective_out(int rank, const char *operation)
@@ -273,8 +273,7 @@ void TRACE_smpi_computing_init(int rank)
  container_t container = PJ_container_get(str);
  type_t type           = PJ_type_get("MPI_STATE", container->type);
  const char* color     = instr_find_color("computing");
- val_t value           = s_val::PJ_value_get_or_new("computing", color, type);
- new PushStateEvent(SIMIX_get_clock(), container, type, value);
+ new PushStateEvent(SIMIX_get_clock(), container, type, value::get_or_new("computing", color, type));
 }
 
 void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
@@ -289,8 +288,8 @@ void TRACE_smpi_computing_in(int rank, instr_extra_data extra)
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_STATE", container->type);
-  val_t value = s_val::PJ_value_get_or_new ("computing", nullptr, type);
-  new PushStateEvent  (SIMIX_get_clock(), container, type, value, static_cast<void*>(extra));
+  value* val            = value::get_or_new("computing", nullptr, type);
+  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_computing_out(int rank)
@@ -315,8 +314,8 @@ void TRACE_smpi_sleeping_init(int rank)
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_STATE", container->type);
   const char *color = instr_find_color ("sleeping");
-  val_t value = s_val::PJ_value_get_or_new ("sleeping", color, type);
-  new PushStateEvent (SIMIX_get_clock(), container, type, value);
+  value* val            = value::get_or_new("sleeping", color, type);
+  new PushStateEvent(SIMIX_get_clock(), container, type, val);
 }
 
 void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
@@ -331,8 +330,8 @@ void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_STATE", container->type);
-  val_t value = s_val::PJ_value_get_or_new ("sleeping", nullptr, type);
-  new PushStateEvent  (SIMIX_get_clock(), container, type, value, static_cast<void*>(extra));
+  value* val            = value::get_or_new("sleeping", nullptr, type);
+  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_sleeping_out(int rank)
@@ -358,8 +357,8 @@ void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_STATE", container->type);
-  val_t value = s_val::PJ_value_get_or_new ("test", nullptr, type);
-  new PushStateEvent  (SIMIX_get_clock(), container, type, value, static_cast<void*>(extra));
+  value* val            = value::get_or_new("test", nullptr, type);
+  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_testing_out(int rank)
@@ -385,8 +384,8 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_STATE", container->type);
   const char *color = instr_find_color (operation);
-  val_t value = s_val::PJ_value_get_or_new (operation, color, type);
-  new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast<void*>(extra));
+  value* val            = value::get_or_new(operation, color, type);
+  new PushStateEvent(SIMIX_get_clock(), container, type, val, static_cast<void*>(extra));
 }
 
 void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
@@ -418,7 +417,7 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
   new StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
 }
 
-void TRACE_smpi_recv(int rank, int src, int dst, int tag)
+void TRACE_smpi_recv(int src, int dst, int tag)
 {
   if (not TRACE_smpi_is_enabled())
     return;