More efficient string switcher.

diff --git a/.gitignore b/.gitignore
index 6a73307cbbae1150d66502ecf562ed3c504964e3..1f554fb848472effce9a6f67f4aad779d307f6d1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,5 @@ dump
 dxsdk
 glretrace
 glretrace.cpp
-glx.cpp
+glxtrace.cpp
 opengl32.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04c7a44d38c7c6c7d4e5ddb50d35e8aac4d49f96..a580abb1b1271db899c62ee944622b5bb7ed7957 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,7 +165,7 @@ if (GLEW_INCLUDE_DIR)
        add_custom_command (
                OUTPUT glretrace.cpp
                COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace.cpp
-               DEPENDS glretrace.py retrace.py glapi.py glenum.py stdapi.py
+               DEPENDS glretrace.py retrace.py codegen.py glapi.py glenum.py stdapi.py
        )
 
        include_directories (

diff --git a/codegen.py b/codegen.py
new file mode 100644 (file)
index 0000000..2aff635
--- /dev/null
+++ b/codegen.py
@@ -0,0 +1,77 @@
+##########################################################################
+#
+# Copyright 2010 VMware, Inc.
+# 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
+# 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
+# furnished to do so, subject to the following conditions:
+#
+# 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
+# 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
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+##########################################################################/
+
+
+def _string_switch(var, prefix, suffixes, case, default):
+    index = len(prefix)
+    indent = '    '*(index + 1)
+
+    if len(suffixes) == 1:
+        suffix = suffixes[0]
+        chars = list(suffix) + ["\\0"]
+        predicates = ['%s[%u] == \'%s\'' % (var, index + i, chars[i]) for i in range(len(chars))]
+        print indent + 'if (%s) {' % (' && '.join(predicates),)
+        value = prefix + suffix
+        print indent + '    // %s' % value
+        case(value)
+        print indent + '}'
+        if default is not None:
+            print indent + 'else {'
+            default()
+            print indent + '}'
+        return
+
+    print indent + 'switch (%s[%u]) {' % (var, index)
+    if "" in suffixes:
+        print indent + 'case \'\\0\':'
+        print indent + '    // %s' % prefix
+        case(prefix)
+        print indent + '    break;'
+
+    chars = [suffix[0] for suffix in suffixes if suffix]
+    chars = list(set(chars))
+    chars.sort()
+
+    for char in chars:
+        print indent + 'case \'%c\':' % (char)
+        new_prefix = prefix + char
+        new_suffixes = [suffix[1:] for suffix in suffixes if suffix.startswith(char)]
+        _string_switch(var, new_prefix, new_suffixes, case, default)
+        print indent + '    break;'
+    if default is not None:
+        print indent + 'default:'
+        default()
+        print indent + '    break;'
+    print indent + '}'
+
+
+def _noop(*args, **kwargs):
+    pass
+
+
+def string_switch(var, values, case=_noop, default=None):
+    values = list(values)
+    values.sort()
+    _string_switch(var, '', values, case, default)

diff --git a/retrace.py b/retrace.py
index 53cc6a028af4962f57431c2cc9737a09f9019fc6..9eb5d0d1cc8f8ab2b8ef8b00e93e9212849c35cb 100644 (file)
--- a/retrace.py
+++ b/retrace.py
@@ -26,7 +26,7 @@
 
 import stdapi
 import glapi
-
+from codegen import *
 
 
 class ConstRemover(stdapi.Rebuilder):
@@ -220,23 +220,24 @@ class Retracer:
                 self.retrace_function(function)
 
         print 'static bool retrace_call(Trace::Call &call) {'
-        for function in functions:
-            if not function.sideeffects:
-                print '    if (call.name() == "%s") {' % function.name
-                print '        return true;'
-                print '    }'
+        print '    const char *name = call.name().c_str();'
         print
         print '    if (verbosity >=1 ) {'
         print '        std::cout << call;'
         print '        std::cout.flush();'
         print '    };'
         print
-        for function in functions:
+
+        func_dict = dict([(function.name, function) for function in functions])
+
+        def handle_case(function_name):
+            function = func_dict[function_name]
             if function.sideeffects:
-                print '    if (call.name() == "%s") {' % function.name
                 print '        retrace_%s(call);' % function.name
-                print '        return true;'
-                print '    }'
+            print '        return true;'
+    
+        string_switch('name', func_dict.keys(), handle_case)
+
         print '    std::cerr << "warning: unknown call " << call.name() << "\\n";'
         print '    return false;'
         print '}'