merging tracing changes

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

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index f263757..c06d40a 100644 (file)
--- a/src/instr/instr_smpi.c
+++ b/src/instr/instr_smpi.c
@@ -45,10 +45,11 @@ static char *TRACE_smpi_get_key(int src, int dst, char *key, int n)
   snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
   xbt_dynar_t d = xbt_dict_get_or_null(keys, aux);
 
-  int length = xbt_dynar_length(d);
-  char *s = xbt_dynar_get_as (d, length-1, char *);
+  xbt_assert(xbt_dynar_length(d)!=0,
+      "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__);
+  char *s = xbt_dynar_get_as (d, 0, char *);
   snprintf (key, n, "%s", s);
-  xbt_dynar_remove_at (d, length-1, NULL);
+  xbt_dynar_remove_at (d, 0, NULL);
   return key;
 }
 
@@ -110,9 +111,9 @@ void TRACE_smpi_init(int rank)
   if (TRACE_smpi_is_grouped()){
     father = getContainer (SIMIX_host_self_get_name());
   }else{
-    father = getContainer ("0");
+    father = getRootContainer ();
   }
-  xbt_assert2(father!=NULL,
+  xbt_assert(father!=NULL,
       "Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__);
   newContainer(str, INSTR_SMPI, father);
 }
@@ -133,9 +134,10 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation)
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = getContainer (str);
-  type_t type = getType ("MPI_STATE");
+  type_t type = getType ("MPI_STATE", container->type);
+  val_t value = getValue (operation, "1 1 1", type);
 
-  new_pajePushState (SIMIX_get_clock(), container, type, operation);
+  new_pajePushState (SIMIX_get_clock(), container, type, value);
 }
 
 void TRACE_smpi_collective_out(int rank, int root, const char *operation)
@@ -145,7 +147,7 @@ void TRACE_smpi_collective_out(int rank, int root, const char *operation)
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = getContainer (str);
-  type_t type = getType ("MPI_STATE");
+  type_t type = getType ("MPI_STATE", container->type);
 
   new_pajePopState (SIMIX_get_clock(), container, type);
 }
@@ -157,9 +159,10 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = getContainer (str);
-  type_t type = getType ("MPI_STATE");
+  type_t type = getType ("MPI_STATE", container->type);
+  val_t value = getValue (operation, "1 1 1", type);
 
-  new_pajePushState (SIMIX_get_clock(), container, type, operation);
+  new_pajePushState (SIMIX_get_clock(), container, type, value);
 }
 
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
@@ -169,7 +172,7 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = getContainer (str);
-  type_t type = getType ("MPI_STATE");
+  type_t type = getType ("MPI_STATE", container->type);
 
   new_pajePopState (SIMIX_get_clock(), container, type);
 }
@@ -184,7 +187,7 @@ void TRACE_smpi_send(int rank, int src, int dst)
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = getContainer (str);
-  type_t type = getType ("MPI_LINK");
+  type_t type = getType ("MPI_LINK", getRootType());
 
   new_pajeStartLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }
@@ -199,7 +202,7 @@ void TRACE_smpi_recv(int rank, int src, int dst)
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = getContainer (str);
-  type_t type = getType ("MPI_LINK");
+  type_t type = getType ("MPI_LINK", getRootType());
 
   new_pajeEndLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }