Add missing commas.

[apitrace] / scripts / tracediff.py

diff --git a/scripts/tracediff.py b/scripts/tracediff.py
index 4f13529d32c257172a3a3eccc9bd07ec873e5264..7237da095e5b7a172e1aae9890b7f99fecd4c86b 100755 (executable)
--- a/scripts/tracediff.py
+++ b/scripts/tracediff.py
@@ -5,7 +5,7 @@
 # All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
@@ -14,7 +14,7 @@
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
@@ -25,71 +25,109 @@
 ##########################################################################/
 
 
-import difflib
+import platform
 import optparse
-import os.path
-import re
+import os
+import shutil
 import subprocess
 import sys
-
-
-call_re = re.compile('^([0-9]+) (\w+)\(')
-
-ansi_re = re.compile('\x1b\[[0-9]{1,2}(;[0-9]{1,2}){0,2}m')
-
-
-def ansi_strip(s):
-    # http://www.theeggeadventure.com/wikimedia/index.php/Linux_Tips#Use_sed_to_remove_ANSI_colors
-    return ansi_re.sub('', s)
-
-
-ignored_function_names = set([
-    'glGetString',
-    'glXGetClientString',
-    'glXGetCurrentDisplay',
-    'glXGetProcAddress',
-    'glXGetProcAddressARB',
-    'wglGetProcAddress',
-])
-
-
-def readtrace(trace):
-    p = subprocess.Popen([options.tracedump, trace], stdout=subprocess.PIPE)
-    lines = []
-    for line in p.stdout.readlines():
-        line = ansi_strip(line)
-        mo = call_re.match(line)
-        if mo:
-            function_name = mo.group(2)
-            if function_name in ignored_function_names:
-                continue
-            lines.append(line[mo.start(2):])
-        else:
-            lines[-1] += line
-    p.wait()
-    return lines
+import tempfile
+
+
+def stripdump(trace, fifo):
+    dump = subprocess.Popen(
+        args = [
+            options.apitrace,
+            'dump',
+            '--color=never',
+            '--arg-names=no',
+            '--calls=' + options.calls,
+            trace
+        ],
+        stdout = subprocess.PIPE,
+        universal_newlines = True,
+    )
+
+    sed = subprocess.Popen(
+        args = [
+            'sed',
+            '-e', r's/\r$//g',
+            '-e', r's/^[0-9]\+ //',
+            '-e', r's/hdc = \w\+/hdc/g',
+        ],
+        stdin = dump.stdout,
+        stdout = open(fifo, 'wt'),
+        universal_newlines = True,
+    )
+
+
+def diff(traces):
+    fifodir = tempfile.mkdtemp()
+    try:
+        fifos = []
+        for i in range(len(traces)):
+            trace = traces[i]
+            fifo = os.path.join(fifodir, str(i))
+            stripdump(trace, fifo)
+            fifos.append(fifo)
+
+        # TODO use difflib instead
+        sdiff = subprocess.Popen(
+            args = [
+                'sdiff',
+                '--width=%u' % options.width,
+                '--speed-large-files',
+            ] + fifos,
+            stdout = subprocess.PIPE,
+            universal_newlines = True,
+        )
+
+        less = subprocess.Popen(
+            args = ['less', '-FRXn'],
+            stdin = sdiff.stdout
+        )
+
+        less.wait()
+
+    finally:
+        shutil.rmtree(fifodir)
+
+
+def columns():
+    import curses
+    curses.setupterm()
+    return curses.tigetnum('cols')
 
 
 def main():
-    global options
+    '''Main program.
+    '''
 
+    default_width = columns()
+
+    # Parse command line options
     optparser = optparse.OptionParser(
-        usage='\n\t%prog <trace> <trace>',
+        usage='\n\t%prog [options] -- TRACE_FILE TRACE_FILE',
         version='%%prog')
     optparser.add_option(
-        '-d', '--tracedump', metavar='PROGRAM',
-        type='string', dest='tracedump', default='tracedump',
-        help='tracedump command [default: %default]')
+        '-a', '--apitrace', metavar='PROGRAM',
+        type='string', dest='apitrace', default='apitrace',
+        help='apitrace command [default: %default]')
+    optparser.add_option(
+        '-c', '--calls', metavar='CALLSET',
+        type="string", dest="calls", default='1-10000',
+        help="calls to compare [default: %default]")
+    optparser.add_option(
+        '-w', '--width', metavar='NUM',
+        type="string", dest="width", default=default_width,
+        help="columns [default: %default]")
 
+    global options
     (options, args) = optparser.parse_args(sys.argv[1:])
     if len(args) != 2:
         optparser.error("incorrect number of arguments")
 
-    ref_lines = readtrace(args[0])
-    src_lines = readtrace(args[1])
-
-    diff = difflib.unified_diff(ref_lines, src_lines, n=3)
-    sys.stdout.writelines(diff)
+    diff(args)
 
 
 if __name__ == '__main__':