get trace category from surf_action instead of smx_action when tracing categorized...

[simgrid.git] / src / instr / smpi_instr.c

diff --git a/src/instr/smpi_instr.c b/src/instr/smpi_instr.c
index c5dceca..aa65cd6 100644 (file)
--- a/src/instr/smpi_instr.c
+++ b/src/instr/smpi_instr.c
@@ -10,13 +10,13 @@
 
 static xbt_dict_t keys;
 
-static char *_TRACE_smpi_container (int rank, char *container, int n)
+static char *TRACE_smpi_container (int rank, char *container, int n)
 {
   snprintf (container, n, "rank-%d", rank);
   return container;
 }
 
-static char *_TRACE_smpi_put_key (int src, int dst, char *key, int n)
+static char *TRACE_smpi_put_key (int src, int dst, char *key, int n)
 {
   //get the dynar for src#dst
   char aux[100];
@@ -34,7 +34,7 @@ static char *_TRACE_smpi_put_key (int src, int dst, char *key, int n)
   return key;
 }
 
-static char *_TRACE_smpi_get_key (int src, int dst, char *key, int n)
+static char *TRACE_smpi_get_key (int src, int dst, char *key, int n)
 {
   char aux[100];
   snprintf (aux, 100, "%d#%d", src, dst);
@@ -47,7 +47,7 @@ static char *_TRACE_smpi_get_key (int src, int dst, char *key, int n)
   return key;
 }
 
-void __TRACE_smpi_init ()
+void TRACE_smpi_alloc ()
 {
   keys = xbt_dict_new();
 }
@@ -59,9 +59,9 @@ void TRACE_smpi_start (void)
   }
 }
 
-void TRACE_smpi_end (void)
+void TRACE_smpi_release (void)
 {
-  TRACE_msg_clean ();
+  TRACE_surf_release ();
   if (IS_TRACING_SMPI){
     TRACE_end();
   }
@@ -72,7 +72,7 @@ void TRACE_smpi_init (int rank)
   if (!IS_TRACING_SMPI) return;
 
   char str[100];
-  _TRACE_smpi_container (rank, str, 100);
+  TRACE_smpi_container (rank, str, 100);
   pajeCreateContainer (SIMIX_get_clock(), str, "MPI_PROCESS",
       SIMIX_host_get_name(SIMIX_host_self()), str);
 }
@@ -83,7 +83,7 @@ void TRACE_smpi_finalize (int rank)
 
   char str[100];
   pajeDestroyContainer (SIMIX_get_clock(), "MPI_PROCESS",
-      _TRACE_smpi_container (rank, str, 100));
+      TRACE_smpi_container (rank, str, 100));
 }
 
 void TRACE_smpi_collective_in (int rank, int root, const char *operation)
@@ -92,7 +92,7 @@ void TRACE_smpi_collective_in (int rank, int root, const char *operation)
 
   char str[100];
   pajePushState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100), operation);
+      TRACE_smpi_container (rank, str, 100), operation);
 }
 
 void TRACE_smpi_collective_out (int rank, int root, const char *operation)
@@ -101,7 +101,7 @@ void TRACE_smpi_collective_out (int rank, int root, const char *operation)
 
   char str[100];
   pajePopState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100));
+      TRACE_smpi_container (rank, str, 100));
 }
 
 void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation)
@@ -110,7 +110,7 @@ void TRACE_smpi_ptp_in (int rank, int src, int dst, const char *operation)
 
   char str[100];
   pajePushState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100), operation);
+      TRACE_smpi_container (rank, str, 100), operation);
 }
 
 void TRACE_smpi_ptp_out (int rank, int src, int dst, const char *operation)
@@ -119,7 +119,7 @@ void TRACE_smpi_ptp_out (int rank, int src, int dst, const char *operation)
 
   char str[100];
   pajePopState (SIMIX_get_clock(), "MPI_STATE",
-      _TRACE_smpi_container (rank, str, 100));
+      TRACE_smpi_container (rank, str, 100));
 }
 
 void TRACE_smpi_send (int rank, int src, int dst)
@@ -127,9 +127,9 @@ void TRACE_smpi_send (int rank, int src, int dst)
   if (!IS_TRACING_SMPI) return;
 
   char key[100], str[100];
-  _TRACE_smpi_put_key (src, dst, key, 100);
+  TRACE_smpi_put_key (src, dst, key, 100);
   pajeStartLink (SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-      _TRACE_smpi_container (src, str, 100), key);
+      TRACE_smpi_container (src, str, 100), key);
 }
 
 void TRACE_smpi_recv (int rank, int src, int dst)
@@ -137,9 +137,9 @@ void TRACE_smpi_recv (int rank, int src, int dst)
   if (!IS_TRACING_SMPI) return;
 
   char key[100], str[100];
-  _TRACE_smpi_get_key (src, dst, key, 100);
+  TRACE_smpi_get_key (src, dst, key, 100);
   pajeEndLink (SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-      _TRACE_smpi_container (dst, str, 100), key);
+      TRACE_smpi_container (dst, str, 100), key);
 }
 #endif