Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / instr_smpi.cpp

diff --git a/src/smpi/instr_smpi.cpp b/src/smpi/instr_smpi.cpp
index 4079b4c..0fe4dc8 100644 (file)
--- a/src/smpi/instr_smpi.cpp
+++ b/src/smpi/instr_smpi.cpp
@@ -5,10 +5,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "private.h"
+#include "private.hpp"
 #include <ctype.h>
-#include <wchar.h>
-#include <stdarg.h>
 #include <simgrid/sg_config.h>
+#include <stdarg.h>
+#include <wchar.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
 
@@ -92,21 +93,15 @@ XBT_PRIVATE char *smpi_container(int rank, char *container, int n)
   return container;
 }
 
-static char *TRACE_smpi_get_key(int src, int dst, char *key, int n);
+static char *TRACE_smpi_get_key(int src, int dst, int tag, char *key, int n, int send);
 
-static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
+static char *TRACE_smpi_put_key(int src, int dst, int tag, char *key, int n, int send)
 {
   //get the dynar for src#dst
   char aux[INSTR_DEFAULT_STR_SIZE];
-  snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
+  snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d#%d#%d", src, dst, tag, send);
   xbt_dynar_t d = static_cast<xbt_dynar_t>(xbt_dict_get_or_null(keys, aux));
 
-  if(xbt_dynar_is_empty(d) == 0){
-    //receive was already pushed, perform a get instead
-    TRACE_smpi_get_key(src , dst, key ,n);
-    return key;
-  }
-
   if (d == nullptr) {
     d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
     xbt_dict_set(keys, aux, d, nullptr);
@@ -115,7 +110,7 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n)
   //generate the key
   static unsigned long long counter = 0;
   counter++;
-  snprintf(key, n, "%d_%d_%llu", src, dst, counter);
+  snprintf(key, n, "%d_%d_%d_%llu", src, dst, tag, counter);
 
   //push it
   char *a = static_cast<char*> (xbt_strdup(key));
@@ -124,15 +119,15 @@ 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, int tag, char *key, int n, int send)
 {
   char aux[INSTR_DEFAULT_STR_SIZE];
-  snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst);
+  snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d#%d#%d", src, dst, tag, send==1?0:1);
   xbt_dynar_t d = static_cast<xbt_dynar_t>(xbt_dict_get_or_null(keys, aux));
 
-  // sometimes the receive may be posted before the send
+  // first posted
   if(xbt_dynar_is_empty(d)){
-      TRACE_smpi_put_key(src, dst, key, n);
+      TRACE_smpi_put_key(src, dst, tag, key, n, send);
       return key;
   }
 
@@ -170,7 +165,7 @@ void TRACE_internal_smpi_set_category (const char *category)
     xbt_dict_set (process_category, processid, xbt_strdup(category), nullptr);
 }
 
-const char *TRACE_internal_smpi_get_category (void)
+const char *TRACE_internal_smpi_get_category ()
 {
   if (!TRACE_smpi_is_enabled())
     return nullptr;
@@ -186,7 +181,7 @@ void TRACE_smpi_alloc()
   process_category = xbt_dict_new_homogeneous(xbt_free_f);
 }
 
-void TRACE_smpi_release(void)
+void TRACE_smpi_release()
 {
   xbt_dict_free(&keys);
   xbt_dict_free(&process_category);
@@ -208,7 +203,23 @@ void TRACE_smpi_init(int rank)
   }
   xbt_assert(father!=nullptr,
       "Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__);
-  PJ_container_new(str, INSTR_SMPI, father);
+#if HAVE_PAPI
+  container_t container =
+#endif
+      PJ_container_new(str, INSTR_SMPI, father);
+#if HAVE_PAPI
+  papi_counter_t counters = smpi_process_papi_counters();
+
+  for (auto& it : counters) {
+    /**
+     * Check whether this variable already exists or not. Otherwise, it will be created
+     * multiple times but only the last one would be used...
+     */
+    if (PJ_type_get_or_null(it.first.c_str(), container->type) == nullptr) {
+      PJ_type_variable_new(it.first.c_str(), nullptr, container->type);
+    }
+  }
+#endif
 }
 
 void TRACE_smpi_finalize(int rank)
@@ -391,34 +402,34 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
   new_pajePopState (SIMIX_get_clock(), container, type);
 }
 
-void TRACE_smpi_send(int rank, int src, int dst, int size)
+void TRACE_smpi_send(int rank, int src, int dst, int tag, int size)
 {
   if (!TRACE_smpi_is_enabled())
     return;
 
   char key[INSTR_DEFAULT_STR_SIZE] = {0};
-  TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
+  TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,1);
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(src, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
-
+  XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key);
   new_pajeStartLinkWithSize (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size);
 }
 
-void TRACE_smpi_recv(int rank, int src, int dst)
+void TRACE_smpi_recv(int rank, int src, int dst, int tag)
 {
   if (!TRACE_smpi_is_enabled())
     return;
 
   char key[INSTR_DEFAULT_STR_SIZE] = {0};
-  TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE);
+  TRACE_smpi_get_key(src, dst, tag, key, INSTR_DEFAULT_STR_SIZE,0);
 
   char str[INSTR_DEFAULT_STR_SIZE];
   smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE);
   container_t container = PJ_container_get (str);
   type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root());
-
+  XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key);
   new_pajeEndLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
 }