X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd1018cf4004d465e9c334191671d70c775f8718..9b1267b59e70deb98dbf69b1231f597ed292aaaf:/teshsuite/smpi/MBI/CollP2PMatchingGenerator.py

diff --git a/teshsuite/smpi/MBI/CollP2PMatchingGenerator.py b/teshsuite/smpi/MBI/CollP2PMatchingGenerator.py
index 315bf407ba..6a184f1fc1 100755
--- a/teshsuite/smpi/MBI/CollP2PMatchingGenerator.py
+++ b/teshsuite/smpi/MBI/CollP2PMatchingGenerator.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 import os
 import sys
-from generator_utils import *
+import generator_utils as gen
 
 template = """// @{generatedby}@
 /* ///////////////////////// The MPI Bugs Initiative ////////////////////////
@@ -85,41 +85,41 @@ int main(int argc, char **argv) {
 """
 
 
-for s in send + isend:
-    for r in recv + irecv:
-        for c in coll:
+for s in gen.send + gen.isend:
+    for r in gen.recv + gen.irecv:
+        for c in gen.coll:
             patterns = {}
             patterns = {'s': s, 'r': r, 'c': c}
             patterns['generatedby'] = f'DO NOT EDIT: this file was generated by {os.path.basename(sys.argv[0])}. DO NOT EDIT.'
-            patterns['p2pfeature'] = 'Yes' if s in send or r in recv else 'Lacking'
-            patterns['ip2pfeature'] = 'Yes' if s in isend or r in irecv else 'Lacking'
-            patterns['collfeature'] = 'Yes' if c in coll else 'Lacking'
+            patterns['p2pfeature'] = 'Yes' if s in gen.send or r in gen.recv else 'Lacking'
+            patterns['ip2pfeature'] = 'Yes' if s in gen.isend or r in gen.irecv else 'Lacking'
+            patterns['collfeature'] = 'Yes' if c in gen.coll else 'Lacking'
             patterns['s'] = s
             patterns['r'] = r
             patterns['c'] = c
-            patterns['init1'] = init[s]("1")
-            patterns['init2'] = init[r]("2")
-            patterns['init3'] = init[c]("3")
-            patterns['fini1'] = fini[s]("1")
-            patterns['fini2'] = fini[r]("2")
-            patterns['fini3'] = fini[c]("3")
-            patterns['free1'] = free[s]("1")
-            patterns['free2'] = free[r]("2")
-            patterns['free3'] = free[c]("3")
-            patterns['operation1'] = operation[s]("1")
-            patterns['operation2'] = operation[r]("2")
-            patterns['operation3'] = operation[c]("3")
+            patterns['init1'] = gen.init[s]("1")
+            patterns['init2'] = gen.init[r]("2")
+            patterns['init3'] = gen.init[c]("3")
+            patterns['fini1'] = gen.fini[s]("1")
+            patterns['fini2'] = gen.fini[r]("2")
+            patterns['fini3'] = gen.fini[c]("3")
+            patterns['free1'] = gen.free[s]("1")
+            patterns['free2'] = gen.free[r]("2")
+            patterns['free3'] = gen.free[c]("3")
+            patterns['operation1'] = gen.operation[s]("1")
+            patterns['operation2'] = gen.operation[r]("2")
+            patterns['operation3'] = gen.operation[c]("3")
 
             # Generate the incorrect matching because of the conditional
-            replace = patterns
+            replace = patterns.copy()
             replace['shortdesc'] = 'Point to point & collective mismatch'
-            replace['longdesc'] = 'Point to point @{r}@ is matched with @{c}@ which causes a deadlock.'
+            replace['longdesc'] = 'The @{s}@ corresponding to the @{r}@ is after @{c}@, while @{r}@ is before @{c}@. This is a deadlock.'
             replace['outcome'] = 'ERROR: CallMatching'
             replace['errormsg'] = 'P2P & Collective mistmatch. @{r}@ at @{filename}@:@{line:MBIERROR2}@ is matched with @{c}@ at @{filename}@:@{line:MBIERROR1}@ wich causes a deadlock.'
-            make_file(template, f'CallOrdering_{r}_{s}_{c}_nok.c', replace)
+            gen.make_file(template, f'CallOrdering_{r}_{s}_{c}_nok.c', replace)
 
             # Generate the incorrect code depending on buffering
-            #  replace = patterns
+            #  replace = patterns.copy()
             #  replace['shortdesc'] = 'Point to point & collective mismatch'
             #  replace['longdesc'] = 'Point to point @{s}@ is matched with @{c}@ which causes a deadlock depending on the buffering mode.'
             #  replace['outcome'] = 'ERROR: BufferingHazard'
@@ -130,4 +130,4 @@ for s in send + isend:
             #  replace['operation2'] = operation[s]("1")
             #  replace['fini1'] = fini[r]("2")
             #  replace['fini2'] = fini[s]("1")
-            #  make_file(template, f'CollP2PBuffering_{r}_{s}_{c}_nok.c', replace)
+            #  gen.make_file(template, f'CollP2PBuffering_{r}_{s}_{c}_nok.c', replace)