X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=wrappers%2Ftrace.py;h=10f71a4dc7a32362dfafe3d96d68705ed3578db8;hb=a78c14780294e326d79f3968f82de1e7bab412c2;hp=5130514dd21f74ed2e041c4a23b25bd505e39f15;hpb=f0194be9450dbfb25795a2a19974babf3e77355e;p=apitrace diff --git a/wrappers/trace.py b/wrappers/trace.py index 5130514..10f71a4 100644 --- a/wrappers/trace.py +++ b/wrappers/trace.py @@ -83,6 +83,9 @@ class ComplexValueSerializer(stdapi.OnceVisitor): def visitArray(self, array): self.visit(array.type) + def visitAttribArray(self, array): + pass + def visitBlob(self, array): pass @@ -138,7 +141,7 @@ class ComplexValueSerializer(stdapi.OnceVisitor): def visitPolymorphic(self, polymorphic): if not polymorphic.contextLess: return - print 'static void _write__%s(int selector, const %s & value) {' % (polymorphic.tag, polymorphic.expr) + print 'static void _write__%s(int selector, %s const & value) {' % (polymorphic.tag, polymorphic.expr) print ' switch (selector) {' for cases, type in polymorphic.iterSwitch(): for case in cases: @@ -203,6 +206,69 @@ class ValueSerializer(stdapi.Visitor, stdapi.ExpanderMixin): print ' trace::localWriter.writeNull();' print ' }' + def visitAttribArray(self, array, instance): + # For each element, decide if it is a key or a value (which depends on the previous key). + # If it is a value, store it as the right type - usually int, some bitfield, or some enum. + # It is currently assumed that an unknown key means that it is followed by an int value. + + # determine the array length which must be passed to writeArray() up front + count = '_c' + array.keyType.tag + print ' {' + print ' int %s;' % count + print ' for (%(c)s = 0; %(array)s && %(array)s[%(c)s] != %(terminator)s; %(c)s += 2) {' \ + % {'c': count, 'array': instance, 'terminator': array.terminator} + if array.hasKeysWithoutValues: + print ' switch (int(%(array)s[%(c)s])) {' % {'array': instance, 'c': count} + for key, valueType in array.valueTypes: + if valueType is None: + print ' case %s:' % key + print ' %s--;' % count # the next value is a key again and checked if it's the terminator + print ' break;' + print ' }' + print ' }' + print ' %(c)s += %(array)s ? 1 : 0;' % {'c': count, 'array': instance} + print ' trace::localWriter.beginArray(%s);' % count + + # for each key / key-value pair write the key and the value, if the key requires one + + index = '_i' + array.keyType.tag + print ' for (int %(i)s = 0; %(i)s < %(count)s; %(i)s++) {' % {'i': index, 'count': count} + print ' trace::localWriter.beginElement();' + self.visitEnum(array.keyType, "%(array)s[%(i)s]" % {'array': instance, 'i': index}) + print ' trace::localWriter.endElement();' + print ' if (%(i)s + 1 >= %(count)s) {' % {'i': index, 'count': count} + print ' break;' + print ' }' + print ' switch (int(%(array)s[%(i)s++])) {' % {'array': instance, 'i': index} + # write generic value the usual way + for key, valueType in array.valueTypes: + if valueType is not None: + print ' case %s:' % key + print ' trace::localWriter.beginElement();' + self.visitElement(index, valueType, '(%(array)s)[%(i)s]' % {'array': instance, 'i': index}) + print ' trace::localWriter.endElement();' + print ' break;' + # known key with no value, just decrease the index so we treat the next value as a key + if array.hasKeysWithoutValues: + for key, valueType in array.valueTypes: + if valueType is None: + print ' case %s:' % key + print ' %s--;' % index + print ' break;' + # unknown key, write an int value + print ' default:' + print ' trace::localWriter.beginElement();' + print ' os::log("apitrace: warning: %s: unknown key 0x%04X, interpreting value as int\\n", ' + \ + '__FUNCTION__, int(%(array)s[%(i)s]));' % {'array': instance, 'i': index} + print ' trace::localWriter.writeSInt(%(array)s[%(i)s]);' % {'array': instance, 'i': index} + print ' trace::localWriter.endElement();' + print ' break;' + print ' }' + print ' }' + print ' trace::localWriter.endArray();' + print ' }' + + def visitBlob(self, blob, instance): print ' trace::localWriter.writeBlob(%s, %s);' % (instance, self.expand(blob.size)) @@ -382,6 +448,9 @@ class ValueUnwrapper(ValueWrapper): class Tracer: '''Base class to orchestrate the code generation of API tracing.''' + # 0-3 are reserved to memcpy, malloc, free, and realloc + __id = 4 + def __init__(self): self.api = None @@ -449,9 +518,14 @@ 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, function.id, function.name, len(function.args), function.name) + print 'static const trace::FunctionSig _%s_sig = {%u, "%s", %u, _%s_args};' % (function.name, self.getFunctionSigId(), function.name, len(function.args), function.name) print + def getFunctionSigId(self): + id = Tracer.__id + Tracer.__id += 1 + return id + def isFunctionPublic(self, function): return True @@ -466,7 +540,7 @@ class Tracer: # No-op if tracing is disabled print ' if (!trace::isTracingEnabled()) {' - Tracer.invokeFunction(self, function) + self.doInvokeFunction(function) if function.type is not stdapi.Void: print ' return _result;' else: @@ -485,6 +559,8 @@ class Tracer: for arg in function.args: if not arg.output: self.unwrapArg(function, arg) + for arg in function.args: + if not arg.output: self.serializeArg(function, arg) print ' trace::localWriter.endEnter();' self.invokeFunction(function) @@ -502,7 +578,11 @@ class Tracer: self.wrapRet(function, "_result") print ' trace::localWriter.endLeave();' - def invokeFunction(self, function, prefix='_', suffix=''): + def invokeFunction(self, function): + self.doInvokeFunction(function) + + def doInvokeFunction(self, function, prefix='_', suffix=''): + # Same as invokeFunction() but called both when trace is enabled or disabled. if function.type is stdapi.Void: result = '' else: @@ -556,9 +636,6 @@ class Tracer: def wrapRet(self, function, instance): self.wrapValue(function.type, instance) - def unwrapRet(self, function, instance): - self.unwrapValue(function.type, instance) - def needsWrapping(self, type): visitor = WrapDecider() visitor.visit(type) @@ -620,7 +697,8 @@ class Tracer: # Private constructor print '%s::%s(%s * pInstance) {' % (getWrapperInterfaceName(interface), getWrapperInterfaceName(interface), interface.name) for type, name, value in self.enumWrapperInterfaceVariables(interface): - print ' %s = %s;' % (name, value) + if value is not None: + print ' %s = %s;' % (name, value) print '}' print @@ -634,12 +712,12 @@ class Tracer: print r' assert(pWrapper->m_pInstance == pInstance);' print r' if (pWrapper->m_pVtbl == *(void **)pInstance &&' print r' pWrapper->m_NumMethods >= %s) {' % len(list(interface.iterBaseMethods())) - print r' //os::log("%s: fetched pvObj=%p pWrapper=%p pVtbl=%p\n", functionName, pInstance, pWrapper, pWrapper->m_pVtbl);' + #print r' os::log("%s: fetched pvObj=%p pWrapper=%p pVtbl=%p\n", functionName, pInstance, pWrapper, pWrapper->m_pVtbl);' print r' return pWrapper;' print r' }' print r' }' print r' Wrap%s *pWrapper = new Wrap%s(pInstance);' % (interface.name, interface.name) - print r' //os::log("%%s: created %s pvObj=%%p pWrapper=%%p pVtbl=%%p\n", functionName, pInstance, pWrapper, pWrapper->m_pVtbl);' % interface.name + #print r' os::log("%%s: created %s pvObj=%%p pWrapper=%%p pVtbl=%%p\n", functionName, pInstance, pWrapper, pWrapper->m_pVtbl);' % interface.name print r' g_WrappedObjects[pInstance] = pWrapper;' print r' return pWrapper;' print '}' @@ -647,7 +725,7 @@ class Tracer: # Destructor print '%s::~%s() {' % (getWrapperInterfaceName(interface), getWrapperInterfaceName(interface)) - print r' //os::log("%s::Release: deleted pvObj=%%p pWrapper=%%p pVtbl=%%p\n", m_pInstance, this, m_pVtbl);' % interface.name + #print r' os::log("%s::Release: deleted pvObj=%%p pWrapper=%%p pVtbl=%%p\n", m_pInstance, this, m_pVtbl);' % interface.name print r' g_WrappedObjects.erase(m_pInstance);' print '}' print @@ -662,7 +740,7 @@ class Tracer: print method.prototype(getWrapperInterfaceName(interface) + '::' + method.name) + ' {' if False: - print r' os::log("# %s #\n", __FUNCTION__);' + print r' os::log("%%s(%%p -> %%p)\n", "%s", this, m_pInstance);' % (getWrapperInterfaceName(interface) + '::' + method.name) if method.type is not stdapi.Void: print ' %s _result;' % method.type @@ -678,7 +756,7 @@ class Tracer: assert not method.internal 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};' % (method.id, interface.name + '::' + method.name, len(method.args) + 1) + print ' static const trace::FunctionSig _sig = {%u, "%s", %u, _args};' % (self.getFunctionSigId(), interface.name + '::' + method.name, len(method.args) + 1) print ' %s *_this = static_cast<%s *>(m_pInstance);' % (base, base) @@ -689,6 +767,8 @@ class Tracer: for arg in method.args: if not arg.output: self.unwrapArg(method, arg) + for arg in method.args: + if not arg.output: self.serializeArg(method, arg) print ' trace::localWriter.endEnter();' @@ -773,7 +853,7 @@ class Tracer: print ' %s_this->%s(%s);' % (result, method.name, ', '.join([str(arg.name) for arg in method.args])) def emit_memcpy(self, dest, src, length): - print ' unsigned _call = trace::localWriter.beginEnter(&trace::memcpy_sig);' + print ' unsigned _call = trace::localWriter.beginEnter(&trace::memcpy_sig, true);' print ' trace::localWriter.beginArg(0);' print ' trace::localWriter.writePointer((uintptr_t)%s);' % dest print ' trace::localWriter.endArg();'