Commit b93acb92 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging 



# gpg: Signature made Fri 06 Feb 2015 13:45:06 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: Print PID and time in stderr traces

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b3cd91e0 dd9fe29c

scripts/tracetool/backend/stderr.py

+9 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ PUBLIC = True 


def generate_h_begin(events):

    out('#include <stdio.h>',

        '#include <sys/time.h>',

        '#include <sys/types.h>',

        '#include <unistd.h>',

        '#include "trace/control.h"',

        '')
@@ -31,7 +34,12 @@ def generate_h(event): 
        argnames = ", " + argnames



    out('    if (trace_event_get_state(%(event_id)s)) {',

        '        fprintf(stderr, "%(name)s " %(fmt)s "\\n" %(argnames)s);',

        '        struct timeval _now;',

        '        gettimeofday(&_now, NULL);',

        '        fprintf(stderr, "%%d@%%zd.%%06zd:%(name)s " %(fmt)s "\\n",',

        '                        getpid(),',

        '                        (size_t)_now.tv_sec, (size_t)_now.tv_usec',

        '                        %(argnames)s);',

        '    }',

        event_id="TRACE_" + event.name.upper(),

        name=event.name,