X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3bb69ce3e0369af70550f67b6e50477218676e1..ad4640ba22bba03fdc83e735157be1b4d23079eb:/src/instr/instr_smpi.c

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index 5293a4508a..c06d40ad80 100644
--- 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;
 }
 
@@ -56,10 +57,7 @@ static xbt_dict_t process_category;
 
 void TRACE_internal_smpi_set_category (const char *category)
 {
-  if (!TRACE_is_active())
-    return;
-  if (!TRACE_smpi_is_enabled())
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   //declare category
   TRACE_category (category);
@@ -74,10 +72,7 @@ void TRACE_internal_smpi_set_category (const char *category)
 
 const char *TRACE_internal_smpi_get_category (void)
 {
-  if (!TRACE_is_active())
-    return NULL;
-  if (!TRACE_smpi_is_enabled())
-    return NULL;
+  if (!TRACE_smpi_is_enabled()) return NULL;
 
   char processid[INSTR_DEFAULT_STR_SIZE];
   snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
@@ -92,23 +87,22 @@ void TRACE_smpi_alloc()
 
 void TRACE_smpi_start(void)
 {
-  if (TRACE_is_enabled()) {
-    TRACE_start();
-  }
+  if (!TRACE_smpi_is_enabled()) return;
+
+  TRACE_start();
 }
 
 void TRACE_smpi_release(void)
 {
-  if (TRACE_is_enabled()) {
-    TRACE_surf_release();
-    TRACE_end();
-  }
+  if (!TRACE_smpi_is_enabled()) return;
+
+  TRACE_surf_release();
+  TRACE_end();
 }
 
 void TRACE_smpi_init(int rank)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -117,17 +111,16 @@ 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);
 }
 
 void TRACE_smpi_finalize(int rank)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
@@ -136,60 +129,57 @@ void TRACE_smpi_finalize(int rank)
 
 void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   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);
 
-  pajePushState(SIMIX_get_clock(), type->id, container->id, operation);
+  new_pajePushState (SIMIX_get_clock(), container, type, value);
 }
 
 void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   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);
 
-  pajePopState(SIMIX_get_clock(), type->id, container->id);
+  new_pajePopState (SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   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);
 
-  pajePushState(SIMIX_get_clock(), type->id, container->id, operation);
+  new_pajePushState (SIMIX_get_clock(), container, type, value);
 }
 
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   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);
 
-  pajePopState(SIMIX_get_clock(), type->id, container->id);
+  new_pajePopState (SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_send(int rank, int src, int dst)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char key[INSTR_DEFAULT_STR_SIZE];
   TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
@@ -197,15 +187,14 @@ 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());
 
-  pajeStartLink(SIMIX_get_clock(), type->id, type->father->id, "PTP", container->id, key);
+  new_pajeStartLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }
 
 void TRACE_smpi_recv(int rank, int src, int dst)
 {
-  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
-    return;
+  if (!TRACE_smpi_is_enabled()) return;
 
   char key[INSTR_DEFAULT_STR_SIZE];
   TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
@@ -213,8 +202,8 @@ 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());
 
-  pajeEndLink(SIMIX_get_clock(), type->id, type->father->id, "PTP", container->id, key);
+  new_pajeEndLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }
 #endif /* HAVE_TRACING */