X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=trace.py;h=2cb11e5b5d98e8f0fe0ba679ef8b9a761d746cd6;hb=2f2ea48c8f1729bf20936d550b6294bafadb6140;hp=9cc2b0a77a3e746c424d05aae3f84c13af0a0fe1;hpb=461611165f5088edf02c40dc1544dd5b78fa0c24;p=apitrace diff --git a/trace.py b/trace.py index 9cc2b0a..2cb11e5 100644 --- a/trace.py +++ b/trace.py @@ -52,13 +52,13 @@ class DumpDeclarator(stdapi.OnceVisitor): def visit_struct(self, struct): for type, name in struct.members: self.visit(type) - print 'static void __traceStruct%s(const %s &value) {' % (struct.id, struct.expr) + print 'static void __traceStruct%s(const %s &value) {' % (struct.tag, struct.expr) print ' static const char * members[%u] = {' % (len(struct.members),) for type, name, in struct.members: print ' "%s",' % (name,) print ' };' print ' static const Trace::StructSig sig = {' - print ' %u, "%s", %u, members' % (int(struct.id), struct.name, len(struct.members)) + print ' %u, "%s", %u, members' % (struct.id, struct.name, len(struct.members)) print ' };' print ' Trace::localWriter.beginStruct(&sig);' for type, name in struct.members: @@ -76,7 +76,7 @@ class DumpDeclarator(stdapi.OnceVisitor): __enum_id = 0 def visit_enum(self, enum): - print 'static void __traceEnum%s(const %s value) {' % (enum.id, enum.expr) + print 'static void __traceEnum%s(const %s value) {' % (enum.tag, enum.expr) n = len(enum.values) for i in range(n): value = enum.values[i] @@ -98,13 +98,13 @@ class DumpDeclarator(stdapi.OnceVisitor): print def visit_bitmask(self, bitmask): - print 'static const Trace::BitmaskFlag __bitmask%s_flags[] = {' % (bitmask.id) + print 'static const Trace::BitmaskFlag __bitmask%s_flags[] = {' % (bitmask.tag) for value in bitmask.values: print ' {"%s", %s},' % (value, value) print '};' print - print 'static const Trace::BitmaskSig __bitmask%s_sig = {' % (bitmask.id) - print ' %u, %u, __bitmask%s_flags' % (int(bitmask.id), len(bitmask.values), bitmask.id) + print 'static const Trace::BitmaskSig __bitmask%s_sig = {' % (bitmask.tag) + print ' %u, %u, __bitmask%s_flags' % (bitmask.id, len(bitmask.values), bitmask.tag) print '};' print @@ -136,14 +136,23 @@ class DumpDeclarator(stdapi.OnceVisitor): print def visit_polymorphic(self, polymorphic): - pass + print 'static void __tracePolymorphic%s(int selector, const %s & value) {' % (polymorphic.tag, polymorphic.expr) + print ' switch (selector) {' + for cases, type in polymorphic.iterswitch(): + for case in cases: + print ' %s:' % case + dump_instance(type, 'static_cast<%s>(value)' % (type,)) + print ' break;' + print ' }' + print '}' + print class DumpImplementer(stdapi.Visitor): '''Dump an instance.''' def visit_literal(self, literal, instance): - print ' Trace::localWriter.write%s(%s);' % (literal.format, instance) + print ' Trace::localWriter.write%s(%s);' % (literal.kind, instance) def visit_string(self, string, instance): if string.length is not None: @@ -155,11 +164,11 @@ class DumpImplementer(stdapi.Visitor): self.visit(const.type, instance) def visit_struct(self, struct, instance): - print ' __traceStruct%s(%s);' % (struct.id, instance) + print ' __traceStruct%s(%s);' % (struct.tag, instance) def visit_array(self, array, instance): - length = '__c' + array.type.id - index = '__i' + array.type.id + length = '__c' + array.type.tag + index = '__i' + array.type.tag print ' if (%s) {' % instance print ' size_t %s = %s;' % (length, array.length) print ' Trace::localWriter.beginArray(%s);' % length @@ -177,10 +186,10 @@ class DumpImplementer(stdapi.Visitor): print ' Trace::localWriter.writeBlob(%s, %s);' % (instance, blob.size) def visit_enum(self, enum, instance): - print ' __traceEnum%s(%s);' % (enum.id, instance) + print ' __traceEnum%s(%s);' % (enum.tag, instance) def visit_bitmask(self, bitmask, instance): - print ' Trace::localWriter.writeBitmask(&__bitmask%s_sig, %s);' % (bitmask.id, instance) + print ' Trace::localWriter.writeBitmask(&__bitmask%s_sig, %s);' % (bitmask.tag, instance) def visit_pointer(self, pointer, instance): print ' if (%s) {' % instance @@ -206,13 +215,7 @@ class DumpImplementer(stdapi.Visitor): print ' Trace::localWriter.writeOpaque((const void *)&%s);' % instance def visit_polymorphic(self, polymorphic, instance): - print ' switch (%s) {' % polymorphic.switch_expr - for cases, type in polymorphic.iterswitch(): - for case in cases: - print ' %s:' % case - self.visit(type, 'static_cast<%s>(%s)' % (type, instance)); - print ' break;' - print ' }' + print ' __tracePolymorphic%s(%s, %s);' % (polymorphic.tag, polymorphic.switch_expr, instance) dump_instance = DumpImplementer().visit @@ -337,7 +340,7 @@ class Tracer: print 'static const char * __%s_args[%u] = {%s};' % (function.name, len(function.args), ', '.join(['"%s"' % arg.name for arg in function.args])) else: print 'static const char ** __%s_args = NULL;' % (function.name,) - print 'static const Trace::FunctionSig __%s_sig = {%u, "%s", %u, __%s_args};' % (function.name, int(function.id), function.name, len(function.args), function.name) + print 'static const Trace::FunctionSig __%s_sig = {%u, "%s", %u, __%s_args};' % (function.name, function.id, function.name, len(function.args), function.name) print def is_public_function(self, function): @@ -423,7 +426,7 @@ class Tracer: def trace_method(self, interface, method): print method.prototype(interface_wrap_name(interface) + '::' + method.name) + ' {' print ' static const char * __args[%u] = {%s};' % (len(method.args) + 1, ', '.join(['"this"'] + ['"%s"' % arg.name for arg in method.args])) - print ' static const Trace::FunctionSig __sig = {%u, "%s", %u, __args};' % (int(method.id), interface.name + '::' + method.name, len(method.args) + 1) + print ' static const Trace::FunctionSig __sig = {%u, "%s", %u, __args};' % (method.id, interface.name + '::' + method.name, len(method.args) + 1) print ' unsigned __call = Trace::localWriter.beginEnter(&__sig);' print ' Trace::localWriter.beginArg(0);' print ' Trace::localWriter.writeOpaque((const void *)m_pInstance);'