X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37f5b9a91a456e44ca9a312f84201b3c562e90c6..0df1dfc55b8592a4e37d79c49b2aedfbaf256823:/src/smpi/instr_smpi.c

diff --git a/src/smpi/instr_smpi.c b/src/smpi/instr_smpi.c
index 6e048ba96e..101de29f2f 100644
--- a/src/smpi/instr_smpi.c
+++ b/src/smpi/instr_smpi.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,9 +10,6 @@
 #include <stdarg.h>
 #include <simgrid/sg_config.h>
 
-
-#ifdef HAVE_TRACING
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI");
 
 static xbt_dict_t keys;
@@ -26,7 +23,7 @@ static const char *smpi_colors[] ={
     "wait",     "1 1 0",
     "waitall",  "0.78 0.78 0",
     "waitany",  "0.78 0.78 0.58",
-    "test",     "0.52 0.52 0"
+    "test",     "0.52 0.52 0",
 
     "allgather",     "1 0 0",
     "allgatherv",    "1 0.52 0.52",
@@ -49,6 +46,15 @@ static const char *smpi_colors[] ={
 
     "init",       "0 1 0",
     "finalize",     "0 1 0",
+
+    "put",       "0.3 1 0",
+    "get",       "0 1 0.3",
+    "accumulate",       "1 0.3 0",
+    "win_fence",       "1 0 0.3",
+    "win_post",       "1 0 0.8",
+    "win_wait",       "1 0.8 0",
+    "win_start",       "0.8 0 1",
+    "win_complete",       "0.8 1 0",
     NULL, NULL,
 };
 
@@ -177,7 +183,7 @@ const char *TRACE_internal_smpi_get_category (void)
 void TRACE_smpi_alloc()
 {
   keys = xbt_dict_new_homogeneous(xbt_dynar_free_voidp);
-  process_category = xbt_dict_new_homogeneous(xbt_free);
+  process_category = xbt_dict_new_homogeneous(xbt_free_f);
 }
 
 void TRACE_smpi_release(void)
@@ -411,4 +417,3 @@ void TRACE_smpi_recv(int rank, int src, int dst)
 
   new_pajeEndLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key);
 }
-#endif /* HAVE_TRACING */