Move trace dumping to a separate module. Add option to not dump arg names.

[apitrace] / dispatch.py

diff --git a/dispatch.py b/dispatch.py
index bd17e0d8968175807914b66a520f72dbd4e3a3c4..adb16b71ab7f23682e90f53e42b7bb5d44134082 100644 (file)
--- a/dispatch.py
+++ b/dispatch.py
@@ -61,17 +61,11 @@ class Dispatcher:
         # functions
         print '#ifdef RETRACE'
         for function in api.functions:
-            if self.is_public_function(function):
-                print '#define __%s %s' % (function.name, function.name)
-            else:
-                print '#define %s __%s' % (function.name, function.name)
+            print '#define %s __%s' % (function.name, function.name)
         print '#endif /* RETRACE */'
         print
 
     def dispatch_function(self, function):
-        if self.is_public_function(function):
-            print '#ifndef RETRACE'
-            print
         ptype = function_pointer_type(function)
         pvalue = function_pointer_value(function)
         print 'typedef ' + function.prototype('* %s' % ptype) + ';'
@@ -87,9 +81,6 @@ class Dispatcher:
         print '    %s%s(%s);' % (ret, pvalue, ', '.join([str(arg.name) for arg in function.args]))
         print '}'
         print
-        if self.is_public_function(function):
-            print '#endif /* !RETRACE */'
-            print
 
     def is_public_function(self, function):
         return True
@@ -110,7 +101,7 @@ class Dispatcher:
 
     def fail_function(self, function):
         if function.type is stdapi.Void or function.fail is not None:
-            print r'            os::DebugMessage("warning: ignoring call to unavailable function %s\n", __name);'
+            print r'            os::log("warning: ignoring call to unavailable function %s\n", __name);'
             if function.type is stdapi.Void:
                 assert function.fail is None
                 print '            return;' 
@@ -118,7 +109,7 @@ class Dispatcher:
                 assert function.fail is not None
                 print '            return %s;' % function.fail
         else:
-            print r'            os::DebugMessage("error: unavailable function %s\n", __name);'
-            print r'            os::Abort();'
+            print r'            os::log("error: unavailable function %s\n", __name);'
+            print r'            os::abort();'