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

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index db64b266d4..99207bbee4 100644
--- a/src/instr/instr_smpi.c
+++ b/src/instr/instr_smpi.c
@@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
 
 static xbt_dict_t keys;
 
-static char *TRACE_smpi_container(int rank, char *container, int n)
+static char *smpi_container(int rank, char *container, int n)
 {
   snprintf(container, n, "rank-%d", rank);
   return container;
@@ -56,7 +56,13 @@ static xbt_dict_t process_category;
 
 void TRACE_internal_smpi_set_category (const char *category)
 {
-  if (!TRACE_smpi_is_enabled()) return;
+  if (!TRACE_is_active())
+    return;
+  if (!TRACE_smpi_is_enabled())
+    return;
+
+  //declare category
+  TRACE_category (category);
 
   char processid[INSTR_DEFAULT_STR_SIZE];
   snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
@@ -68,7 +74,10 @@ void TRACE_internal_smpi_set_category (const char *category)
 
 const char *TRACE_internal_smpi_get_category (void)
 {
-  if (!TRACE_smpi_is_enabled()) return NULL;
+  if (!TRACE_is_active())
+    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());
@@ -83,104 +92,129 @@ void TRACE_smpi_alloc()
 
 void TRACE_smpi_start(void)
 {
-  if (TRACE_smpi_is_enabled()) {
+  if (TRACE_is_enabled()) {
     TRACE_start();
   }
 }
 
 void TRACE_smpi_release(void)
 {
-  TRACE_surf_release();
-  if (TRACE_smpi_is_enabled()) {
+  if (TRACE_is_enabled()) {
+    TRACE_surf_release();
     TRACE_end();
   }
 }
 
 void TRACE_smpi_init(int rank)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+
+  container_t father;
   if (TRACE_smpi_is_grouped()){
-    pajeCreateContainer(SIMIX_get_clock(), str, "MPI_PROCESS",
-                      SIMIX_host_self_get_name(), str);
+    father = getContainer (SIMIX_host_self_get_name());
   }else{
-    pajeCreateContainer(SIMIX_get_clock(), str, "MPI_PROCESS",
-                      "platform", str);
+    father = getContainer ("0");
   }
+  xbt_assert2(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_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  pajeDestroyContainer(SIMIX_get_clock(), "MPI_PROCESS",
-                       TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
+  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  destroyContainer(getContainer (str));
 }
 
 void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  pajePushState(SIMIX_get_clock(), "MPI_STATE",
-                TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE), operation);
+  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  container_t container = getContainer (str);
+  type_t type = getType ("MPI_STATE");
+
+  new_pajePushState (SIMIX_get_clock(), container, type, operation);
 }
 
 void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  pajePopState(SIMIX_get_clock(), "MPI_STATE",
-               TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
+  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  container_t container = getContainer (str);
+  type_t type = getType ("MPI_STATE");
+
+  new_pajePopState (SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  pajePushState(SIMIX_get_clock(), "MPI_STATE",
-                TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE), operation);
+  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  container_t container = getContainer (str);
+  type_t type = getType ("MPI_STATE");
+
+  new_pajePushState (SIMIX_get_clock(), container, type, operation);
 }
 
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
-  pajePopState(SIMIX_get_clock(), "MPI_STATE",
-               TRACE_smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE));
+  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
+  container_t container = getContainer (str);
+  type_t type = getType ("MPI_STATE");
+
+  new_pajePopState (SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_send(int rank, int src, int dst)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
-  char key[INSTR_DEFAULT_STR_SIZE], str[INSTR_DEFAULT_STR_SIZE];
+  char key[INSTR_DEFAULT_STR_SIZE];
   TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
-  pajeStartLink(SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-                TRACE_smpi_container(src, str, INSTR_DEFAULT_STR_SIZE), key);
+
+  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");
+
+  new_pajeStartLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }
 
 void TRACE_smpi_recv(int rank, int src, int dst)
 {
-  if (!TRACE_smpi_is_enabled())
+  if (!(TRACE_is_active() && TRACE_smpi_is_enabled()))
     return;
 
-  char key[INSTR_DEFAULT_STR_SIZE], str[INSTR_DEFAULT_STR_SIZE];
+  char key[INSTR_DEFAULT_STR_SIZE];
   TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
-  pajeEndLink(SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
-              TRACE_smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE), key);
+
+  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");
+
+  new_pajeEndLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }
 #endif /* HAVE_TRACING */