Commit 79218be4 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Stefan Hajnoczi
Browse files

trace: give each trace event a named TraceEvent struct 



Currently we only expose a TraceEvent array, which must
be indexed via the TraceEventID enum constants. This
changes the generator to expose a named TraceEvent
instance for each event, with an _EVENT suffix.

Reviewed-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-10-git-send-email-berrange@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent a82417b5

scripts/tracetool/__init__.py

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ class Event(object): 
    QEMU_TRACE               = "trace_%(name)s"

    QEMU_TRACE_TCG           = QEMU_TRACE + "_tcg"

    QEMU_DSTATE              = "_TRACE_%(NAME)s_DSTATE"

    QEMU_EVENT               = "_TRACE_%(NAME)s_EVENT"



    def api(self, fmt=None):

        if fmt is None:

scripts/tracetool/format/events_c.py

+13 −6
Original line number Diff line number Diff line
@@ -28,22 +28,29 @@ def generate(events, backend): 
    for e in events:

        out('uint16_t %s;' % e.api(e.QEMU_DSTATE))



    out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')



    for e in events:

        if "vcpu" in e.properties:

            vcpu_id = "TRACE_VCPU_" + e.name.upper()

        else:

            vcpu_id = "TRACE_VCPU_EVENT_COUNT"

        out('    { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'

            ' .name = \"%(name)s\",'

        out('TraceEvent %(event)s = {',

            '    .id = %(id)s,',

            '    .vcpu_id = %(vcpu_id)s,',

            '    .name = \"%(name)s\",',

            '    .sstate = %(sstate)s,',

            ' .dstate = &%(dstate)s, }, ',

            '    .dstate = &%(dstate)s ',

            '};',

            event = e.api(e.QEMU_EVENT),

            id = "TRACE_" + e.name.upper(),

            vcpu_id = vcpu_id,

            name = e.name,

            sstate = "TRACE_%s_ENABLED" % e.name.upper(),

            dstate = e.api(e.QEMU_DSTATE))



    out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')



    for e in events:

        out('    &%(event)s,', event = e.api(e.QEMU_EVENT))



    out('};',

        '')

scripts/tracetool/format/events_h.py

+8 −3
Original line number Diff line number Diff line
@@ -21,7 +21,13 @@ def generate(events, backend): 
        '',

        '#ifndef TRACE__GENERATED_EVENTS_H',

        '#define TRACE__GENERATED_EVENTS_H',

        '')

        '',

        '#include "trace/event-internal.h"',

        )



    for e in events:

        out('extern TraceEvent %(event)s;',

            event = e.api(e.QEMU_EVENT))



    # event identifiers

    out('typedef enum {')
@@ -58,6 +64,5 @@ def generate(events, backend): 
                enabled=enabled)

        out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))



    out('#include "trace/event-internal.h"',

        '',

    out('',

        '#endif  /* TRACE__GENERATED_EVENTS_H */')

trace/control-internal.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "qom/cpu.h"





extern TraceEvent trace_events[];

extern TraceEvent *trace_events[];

extern int trace_events_enabled_count;

trace/control.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern) 
TraceEvent *trace_event_iter_next(TraceEventIter *iter)

{

    while (iter->event < TRACE_EVENT_COUNT) {

        TraceEvent *ev = &(trace_events[iter->event]);

        TraceEvent *ev = trace_events[iter->event];

        iter->event++;

        if (!iter->pattern ||

            pattern_glob(iter->pattern,