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

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index 0e247c7222..a5c139deec 100644
--- a/src/instr/instr_smpi.c
+++ b/src/instr/instr_smpi.c
@@ -8,6 +8,8 @@
 
 #ifdef HAVE_TRACING
 
+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)
@@ -50,14 +52,41 @@ static char *TRACE_smpi_get_key(int src, int dst, char *key, int n)
   return key;
 }
 
+static xbt_dict_t process_category;
+
+void TRACE_internal_smpi_set_category (const char *category)
+{
+  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());
+  if (xbt_dict_get_or_null (process_category, processid))
+    xbt_dict_remove (process_category, processid);
+  if (category != NULL)
+    xbt_dict_set (process_category, processid, xbt_strdup(category), xbt_free);
+}
+
+const char *TRACE_internal_smpi_get_category (void)
+{
+  if (!TRACE_smpi_is_enabled()) return NULL;
+
+  char processid[INSTR_DEFAULT_STR_SIZE];
+  snprintf (processid, INSTR_DEFAULT_STR_SIZE, "%p", SIMIX_process_self());
+  return xbt_dict_get_or_null (process_category, processid);
+}
+
 void TRACE_smpi_alloc()
 {
   keys = xbt_dict_new();
+  process_category = xbt_dict_new();
 }
 
 void TRACE_smpi_start(void)
 {
-  if (IS_TRACING_SMPI) {
+  if (TRACE_smpi_is_enabled()) {
     TRACE_start();
   }
 }
@@ -65,14 +94,14 @@ void TRACE_smpi_start(void)
 void TRACE_smpi_release(void)
 {
   TRACE_surf_release();
-  if (IS_TRACING_SMPI) {
+  if (TRACE_smpi_is_enabled()) {
     TRACE_end();
   }
 }
 
 void TRACE_smpi_init(int rank)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
@@ -88,7 +117,7 @@ void TRACE_smpi_init(int rank)
 
 void TRACE_smpi_finalize(int rank)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
@@ -98,7 +127,7 @@ void TRACE_smpi_finalize(int rank)
 
 void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
@@ -108,7 +137,7 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation)
 
 void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
@@ -118,7 +147,7 @@ void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 
 void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
@@ -128,7 +157,7 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation)
 
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char str[INSTR_DEFAULT_STR_SIZE];
@@ -138,7 +167,7 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 
 void TRACE_smpi_send(int rank, int src, int dst)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char key[INSTR_DEFAULT_STR_SIZE], str[INSTR_DEFAULT_STR_SIZE];
@@ -149,7 +178,7 @@ void TRACE_smpi_send(int rank, int src, int dst)
 
 void TRACE_smpi_recv(int rank, int src, int dst)
 {
-  if (!IS_TRACING_SMPI)
+  if (!TRACE_smpi_is_enabled())
     return;
 
   char key[INSTR_DEFAULT_STR_SIZE], str[INSTR_DEFAULT_STR_SIZE];
@@ -157,4 +186,4 @@ void TRACE_smpi_recv(int rank, int src, int dst)
   pajeEndLink(SIMIX_get_clock(), "MPI_LINK", "0", "PTP",
               TRACE_smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE), key);
 }
-#endif
+#endif /* HAVE_TRACING */