reduce.py: improved --segfault / added detection of "hang" caused by reduced code / cleanups (danmar#3693)

firewave · web-flow · commit 4f508c93c4c4 · 2022-01-12T22:26:32.000+01:00
diff --git a/tools/reduce.py b/tools/reduce.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 import subprocess
 import sys
+import time
 
+# TODO: add --hang option to detect code which impacts the analysis time
 def show_syntax():
     print('Syntax:')
     print('  reduce.py --cmd=<full command> --expected=<expected text output> --file=<source file> [--segfault]')
@@ -17,15 +19,19 @@ def show_syntax():
 EXPECTED = None
 SEGFAULT = False
 FILE = None
+ORGFILE = None
 BACKUPFILE = None
+TIMEOUTFILE = None
 for arg in sys.argv[1:]:
     if arg.startswith('--cmd='):
         CMD = arg[arg.find('=') + 1:]
     elif arg.startswith('--expected='):
         EXPECTED = arg[arg.find('=') + 1:]
     elif arg.startswith('--file='):
         FILE = arg[arg.find('=') + 1:]
+        ORGFILE = FILE + '.org'
         BACKUPFILE = FILE + '.bak'
+        TIMEOUTFILE = FILE + '.timeout'
     elif arg == '--segfault':
         SEGFAULT = True
 
@@ -37,6 +43,11 @@ def show_syntax():
     print('Abort: No --expected')
     show_syntax()
 
+# need to add '--error-exitcode=0' so detected issues will not be interpreted as a crash
+if SEGFAULT and not '--error-exitcode=0' in CMD:
+    print("Adding '--error-exitcode=0' to --cmd")
+    CMD = CMD + ' --error-exitcode=0'
+
 if FILE is None:
     print('Abort: No --file')
     show_syntax()
@@ -49,9 +60,22 @@ def show_syntax():
 print('FILE=' + FILE)
 
 
-def runtool():
+def runtool(filedata=None):
+    timeout = None
+    if elapsed_time:
+        timeout = elapsed_time * 2
     p = subprocess.Popen(CMD.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    comm = p.communicate()
+    try:
+        comm = p.communicate(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        print('timeout')
+        p.kill()
+        p.communicate()
+        if filedata:
+            writefile(TIMEOUTFILE, filedata)
+        return False
+    #print(p.returncode)
+    #print(comm)
     if SEGFAULT:
         if p.returncode != 0:
             return True
@@ -78,7 +102,7 @@ def replaceandrun(what, filedata, i, line):
     bak = filedata[i]
     filedata[i] = line
     writefile(FILE, filedata)
-    if runtool():
+    if runtool(filedata):
         print('pass')
         writefile(BACKUPFILE, filedata)
         return True
@@ -94,7 +118,7 @@ def replaceandrun2(what, filedata, i, line1, line2):
     filedata[i] = line1
     filedata[i + 1] = line2
     writefile(FILE, filedata)
-    if runtool():
+    if runtool(filedata):
         print('pass')
         writefile(BACKUPFILE, filedata)
     else:
@@ -111,7 +135,7 @@ def clearandrun(what, filedata, i1, i2):
         filedata2[i] = ''
         i = i + 1
     writefile(FILE, filedata2)
-    if runtool():
+    if runtool(filedata2):
         print('pass')
         writefile(BACKUPFILE, filedata2)
         return filedata2
@@ -249,15 +273,19 @@ def removeline(filedata):
 
 # reduce..
 print('Make sure error can be reproduced...')
+elapsed_time = None
+t = time.perf_counter()
 if not runtool():
     print("Cannot reproduce")
     sys.exit(1)
+elapsed_time = time.perf_counter() - t
+print('elapsed_time: {}'.format(elapsed_time))
 
 f = open(FILE, 'rt')
 filedata = f.readlines()
 f.close()
 
-writefile(BACKUPFILE, filedata)
+writefile(ORGFILE, filedata)
 
 while True:
     filedata1 = list(filedata)
