Commit 2d894e48 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Pull request

Minor tracing improvements.

# gpg: Signature made Wed 12 Dec 2018 10:15:30 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: simple style changes
  tracetool: Include thread id information in log backend

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c3ec0fa1 7ff59207

scripts/tracetool/backend/log.py

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ def generate_h(event, group): 
        '        struct timeval _now;',

        '        gettimeofday(&_now, NULL);',

        '        qemu_log("%%d@%%zu.%%06zu:%(name)s " %(fmt)s "\\n",',

        '                 getpid(),',

        '                 qemu_get_thread_id(),',

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

        '                 %(argnames)s);',

        '    }',

trace/simple.c

+2 −2
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ static gpointer writeout_thread(gpointer opaque) 
        wait_for_trace_records_available();



        if (g_atomic_int_get(&dropped_events)) {

            dropped.rec.event = DROPPED_EVENT_ID,

            dropped.rec.event = DROPPED_EVENT_ID;

            dropped.rec.timestamp_ns = get_clock();

            dropped.rec.length = sizeof(TraceRecord) + sizeof(uint64_t),

            dropped.rec.length = sizeof(TraceRecord) + sizeof(uint64_t);

            dropped.rec.pid = trace_pid;

            do {

                dropped_count = g_atomic_int_get(&dropped_events);