From: Christian Heinrich <franz-christian.heinrich@inria.fr>
Date: Wed, 13 Jun 2018 11:45:10 +0000 (+0200)
Subject: [SMPI/TESH] Breaks tests: Fix colors for functions
X-Git-Tag: v3.20~108^2^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c9a12c1cd9a4210ef89e92306cbbc0b8a8067184?ds=sidebyside

[SMPI/TESH] Breaks tests: Fix colors for functions

The map with the colors used in instr_smpi.cpp was not correctly
checked because substrings were allowed too:

If irecv was passed, the map found recv first, checked whether
recv is a substring of irecv (= yes) and returned the color associated
with recv even though irecv was in the map as well.

The bugfix will be in the next commit.
---

diff --git a/examples/smpi/trace/trace.tesh b/examples/smpi/trace/trace.tesh
index bbd5580e39..6b2902ab92 100644
--- a/examples/smpi/trace/trace.tesh
+++ b/examples/smpi/trace/trace.tesh
@@ -136,7 +136,7 @@ $ tail -n +3 ${bindir:=.}/smpi_trace.trace
 > 12 0.000000 2 3 6
 > 13 0.000000 2 3
 > 12 0.000000 2 3 8
-> 5 9 2 PMPI_Isend "0 0 1"
+> 5 9 2 PMPI_Isend "0.52 0.52 1"
 > 5 10 2 PMPI_Wait "1 1 0"
 > 13 0.000000 2 1
 > 12 0.000000 2 1 9
@@ -146,9 +146,9 @@ $ tail -n +3 ${bindir:=.}/smpi_trace.trace
 > 5 11 2 PMPI_Recv "1 0 0"
 > 5 12 2 PMPI_Barrier "0 0.78 0.78"
 > 5 13 2 PMPI_Send "0 0 1"
-> 5 14 2 PMPI_Irecv "1 0 0"
-> 5 15 2 PMPI_Waitany "1 1 0"
-> 5 16 2 PMPI_Waitall "1 1 0"
+> 5 14 2 PMPI_Irecv "1 0.52 0.52"
+> 5 15 2 PMPI_Waitany "0.78 0.78 0.58"
+> 5 16 2 PMPI_Waitall "0.78 0.78 0"
 > 5 17 2 test
 > 5 18 2 PMPI_Finalize "0 1 0"
 > 13 1.000000 2 2