X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97e2219ed6c0e511f6165460cec79afadf42f589..244ffce80a9e2390e24b9788114de037e4ccc0ae:/teshsuite/smpi/MBI/P2PProbeGenerator.py

diff --git a/teshsuite/smpi/MBI/P2PProbeGenerator.py b/teshsuite/smpi/MBI/P2PProbeGenerator.py
index a5bc12f9ae..917859c1b1 100755
--- a/teshsuite/smpi/MBI/P2PProbeGenerator.py
+++ b/teshsuite/smpi/MBI/P2PProbeGenerator.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 ////////////////////////
@@ -93,56 +93,56 @@ int main(int argc, char **argv) {
 """
 
 
-for p in probe:
-    for s in send + isend:
-        for r in recv + irecv:
+for p in gen.probe:
+    for s in gen.send + gen.isend:
+        for r in gen.recv + gen.irecv:
             patterns = {}
             patterns = {'p':p, 's': s, 'r': r}
             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['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['s'] = s
             patterns['r'] = r
             patterns['p'] = p
-            patterns['init1a'] = init[p]("1")
-            patterns['init1b'] = init[s]("1")
-            patterns['init1c'] = init[r]("2")
-            patterns['init2a'] = init[p]("1")
-            patterns['init2b'] = init[r]("3")
-            patterns['init2c'] = init[s]("4")
-            patterns['fini1a'] = fini[p]("1")
-            patterns['fini1b'] = fini[s]("1")
-            patterns['fini1c'] = fini[r]("2")
-            patterns['fini2a'] = fini[p]("1")
-            patterns['fini2b'] = fini[r]("3")
-            patterns['fini2c'] = fini[s]("4")
-            patterns['free1a'] = free[p]("1")
-            patterns['free1b'] = free[s]("1")
-            patterns['free1c'] = free[r]("2")
-            patterns['free2a'] = free[p]("1")
-            patterns['free2b'] = free[r]("3")
-            patterns['free2c'] = free[s]("4")
-            patterns['operation1a'] = operation[p]("1")
-            patterns['operation1b'] = operation[s]("1")
-            patterns['operation1c'] = operation[r]("2")
-            patterns['operation2a'] = operation[p]("1")
-            patterns['operation2b'] = operation[r]("3")
-            patterns['operation2c'] = operation[s]("4")
+            patterns['init1a'] = gen.init[p]("1")
+            patterns['init1b'] = gen.init[s]("1")
+            patterns['init1c'] = gen.init[r]("2")
+            patterns['init2a'] = gen.init[p]("1")
+            patterns['init2b'] = gen.init[r]("3")
+            patterns['init2c'] = gen.init[s]("4")
+            patterns['fini1a'] = gen.fini[p]("1")
+            patterns['fini1b'] = gen.fini[s]("1")
+            patterns['fini1c'] = gen.fini[r]("2")
+            patterns['fini2a'] = gen.fini[p]("1")
+            patterns['fini2b'] = gen.fini[r]("3")
+            patterns['fini2c'] = gen.fini[s]("4")
+            patterns['free1a'] = gen.free[p]("1")
+            patterns['free1b'] = gen.free[s]("1")
+            patterns['free1c'] = gen.free[r]("2")
+            patterns['free2a'] = gen.free[p]("1")
+            patterns['free2b'] = gen.free[r]("3")
+            patterns['free2c'] = gen.free[s]("4")
+            patterns['operation1a'] = gen.operation[p]("1")
+            patterns['operation1b'] = gen.operation[s]("1")
+            patterns['operation1c'] = gen.operation[r]("2")
+            patterns['operation2a'] = gen.operation[p]("1")
+            patterns['operation2b'] = gen.operation[r]("3")
+            patterns['operation2c'] = gen.operation[s]("4")
 
             # Generate the incorrect matching
-            replace = patterns
+            replace = patterns.copy()
             replace['shortdesc'] = 'MPI_Probe is called before MPI_Recv.'
             replace['longdesc'] = 'MPI_Probe is a blocking call that returns only after a matching message has been found. By calling MPI_Probe before MPI_Recv, a deadlock is created.'
             replace['outcome'] = 'ERROR: CallMatching'
             replace['errormsg'] = 'P2P mistmatch. @{p}@ at @{filename}@:@{line:MBIERROR1}@ and @{filename}@:@{line:MBIERROR2}@ are called before @{r}@.'
-            make_file(template, f'CallOrdering_{p}_{r}_{s}_nok.c', replace)
+            gen.make_file(template, f'CallOrdering_{p}_{r}_{s}_nok.c', replace)
 
             # Generate a correct matching
-            replace = patterns
+            replace = patterns.copy()
             replace['shortdesc'] = 'Correct use of MPI_Probe.'
             replace['longdesc'] = 'Correct use of MPI_Probe.'
             replace['outcome'] = 'OK'
             replace['errormsg'] = 'OK'
-            replace['operation1a'] = operation[s]("1")
-            replace['operation1b'] = operation[p]("1")
-            make_file(template, f'CallOrdering_{p}_{r}_{s}_ok.c', replace)
+            replace['operation1a'] = gen.operation[s]("1")
+            replace['operation1b'] = gen.operation[p]("1")
+            gen.make_file(template, f'CallOrdering_{p}_{r}_{s}_ok.c', replace)