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

diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c
index db64b266d4..7cdf66f0f1 100644
--- a/src/instr/instr_smpi.c
+++ b/src/instr/instr_smpi.c
@@ -5,6 +5,9 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/instr_private.h"
+#include <ctype.h>
+#include <wchar.h>
+
 
 #ifdef HAVE_TRACING
 
@@ -12,7 +15,60 @@ 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 const char *smpi_colors[] ={
+    "recv",     "255 000 000",
+    "irecv",    "255 135 135",
+    "send",     "000 000 255",
+    "isend",    "135 135 255",
+    "sendrecv", "000 255 255",
+    "wait",     "255 255 000",
+    "waitall",  "200 200 000",
+    "waitany",  "200 200 150",
+
+    "allgather",     "255 000 000",
+    "allgatherv",    "255 135 135",
+    "allreduce",     "255 000 255",
+    "alltoall",      "135 000 255",
+    "alltoallv",     "200 135 255",
+    "barrier",       "000 200 200",
+    "bcast",         "000 200 100",
+    "gather",        "255 255 000",
+    "gatherv",       "255 255 135",
+    "reduce",        "000 255 000",
+    "reducescatter", "135 255 135",
+    "scan",          "255 150 060",
+    "scatterv",      "135 000 135",
+    "scatter",       "255 190 140",
+
+    NULL, NULL,
+};
+
+static char *str_tolower (const char *str)
+{
+  char *ret = xbt_strdup (str);
+  int i, n = strlen (ret);
+  for (i = 0; i < n; i++)
+    ret[i] = tolower (str[i]);
+  return ret;
+}
+
+static const char *instr_find_color (const char *state)
+{
+  char *target = str_tolower (state);
+  const char *ret = NULL;
+  const char *current;
+  unsigned int i = 0;
+  while ((current = smpi_colors[i])){
+    if (strcmp (state, current) == 0){ ret = smpi_colors[i+1]; break; } //exact match
+    if (strstr(target, current)) { ret = smpi_colors[i+1]; break; }; //as substring
+    i+=2;
+  }
+  free (target);
+  return ret;
+}
+
+
+static char *smpi_container(int rank, char *container, int n)
 {
   snprintf(container, n, "rank-%d", rank);
   return container;
@@ -45,10 +101,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;
 }
 
@@ -58,6 +115,9 @@ 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))
@@ -83,104 +143,124 @@ void TRACE_smpi_alloc()
 
 void TRACE_smpi_start(void)
 {
-  if (TRACE_smpi_is_enabled()) {
-    TRACE_start();
-  }
+  TRACE_start();
 }
 
 void TRACE_smpi_release(void)
 {
+  if (!TRACE_smpi_is_enabled()) return;
+
   TRACE_surf_release();
-  if (TRACE_smpi_is_enabled()) {
-    TRACE_end();
-  }
+  TRACE_end();
 }
 
 void TRACE_smpi_init(int rank)
 {
-  if (!TRACE_smpi_is_enabled())
-    return;
+  if (!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 = getRootContainer ();
   }
+  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_smpi_is_enabled())
-    return;
+  if (!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())
-    return;
+  if (!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", container->type);
+  const char *color = instr_find_color (operation);
+  val_t value = getValue (operation, color, type);
+
+  new_pajePushState (SIMIX_get_clock(), container, type, value);
 }
 
 void TRACE_smpi_collective_out(int rank, int root, const char *operation)
 {
-  if (!TRACE_smpi_is_enabled())
-    return;
+  if (!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", container->type);
+
+  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())
-    return;
+  if (!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", container->type);
+  const char *color = instr_find_color (operation);
+  val_t value = getValue (operation, color, type);
+
+  new_pajePushState (SIMIX_get_clock(), container, type, value);
 }
 
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation)
 {
-  if (!TRACE_smpi_is_enabled())
-    return;
+  if (!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", container->type);
+
+  new_pajePopState (SIMIX_get_clock(), container, type);
 }
 
 void TRACE_smpi_send(int rank, int src, int dst)
 {
-  if (!TRACE_smpi_is_enabled())
-    return;
+  if (!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", getRootType());
+
+  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())
-    return;
+  if (!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", getRootType());
+
+  new_pajeEndLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key);
 }
 #endif /* HAVE_TRACING */