13d4ff07e8
docs/devel/tracing.txt explains "since many source files include
trace.h, [the generated trace.h use] a minimum of types and other
header files included to keep the namespace clean and compile times
and dependencies down."
Commit 4815185902
"trace: Add per-vCPU tracing states for events with
the 'vcpu' property" made them all include qom/cpu.h via
control-internal.h. qom/cpu.h in turn includes about thirty headers.
Ouch.
Per-vCPU tracing is currently not supported in sub-directories'
trace-events. In other words, qom/cpu.h can only be used in
trace-root.h, not in any trace.h.
Split trace/control-vcpu.h off trace/control.h and
trace/control-internal.h. Have the generated trace.h include
trace/control.h (which no longer includes qom/cpu.h), and trace-root.h
include trace/control-vcpu.h (which includes it).
The resulting improvement is a bit disappointing: in my "build
everything" tree, some 1100 out of 6600 objects (not counting tests
and objects that don't depend on qemu/osdep.h) depend on a trace.h,
and about 600 of them no longer depend on qom/cpu.h. But more than
1300 others depend on trace-root.h. More work is clearly needed.
Left for another day.
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-8-armbru@redhat.com>
171 lines
5.0 KiB
C
171 lines
5.0 KiB
C
/*
|
|
* QMP commands for tracing events.
|
|
*
|
|
* Copyright (C) 2014-2016 Lluís Vilanova <vilanova@ac.upc.edu>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/qapi-commands-trace.h"
|
|
#include "control-vcpu.h"
|
|
|
|
|
|
static CPUState *get_cpu(bool has_vcpu, int vcpu, Error **errp)
|
|
{
|
|
if (has_vcpu) {
|
|
CPUState *cpu = qemu_get_cpu(vcpu);
|
|
if (cpu == NULL) {
|
|
error_setg(errp, "invalid vCPU index %u", vcpu);
|
|
}
|
|
return cpu;
|
|
} else {
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static bool check_events(bool has_vcpu, bool ignore_unavailable, bool is_pattern,
|
|
const char *name, Error **errp)
|
|
{
|
|
if (!is_pattern) {
|
|
TraceEvent *ev = trace_event_name(name);
|
|
|
|
/* error for non-existing event */
|
|
if (ev == NULL) {
|
|
error_setg(errp, "unknown event \"%s\"", name);
|
|
return false;
|
|
}
|
|
|
|
/* error for non-vcpu event */
|
|
if (has_vcpu && !trace_event_is_vcpu(ev)) {
|
|
error_setg(errp, "event \"%s\" is not vCPU-specific", name);
|
|
return false;
|
|
}
|
|
|
|
/* error for unavailable event */
|
|
if (!ignore_unavailable && !trace_event_get_state_static(ev)) {
|
|
error_setg(errp, "event \"%s\" is disabled", name);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
} else {
|
|
/* error for unavailable events */
|
|
TraceEventIter iter;
|
|
TraceEvent *ev;
|
|
trace_event_iter_init(&iter, name);
|
|
while ((ev = trace_event_iter_next(&iter)) != NULL) {
|
|
if (!ignore_unavailable && !trace_event_get_state_static(ev)) {
|
|
error_setg(errp, "event \"%s\" is disabled", trace_event_get_name(ev));
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
TraceEventInfoList *qmp_trace_event_get_state(const char *name,
|
|
bool has_vcpu, int64_t vcpu,
|
|
Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
TraceEventInfoList *events = NULL;
|
|
TraceEventIter iter;
|
|
TraceEvent *ev;
|
|
bool is_pattern = trace_event_is_pattern(name);
|
|
CPUState *cpu;
|
|
|
|
/* Check provided vcpu */
|
|
cpu = get_cpu(has_vcpu, vcpu, &err);
|
|
if (err) {
|
|
error_propagate(errp, err);
|
|
return NULL;
|
|
}
|
|
|
|
/* Check events */
|
|
if (!check_events(has_vcpu, true, is_pattern, name, errp)) {
|
|
return NULL;
|
|
}
|
|
|
|
/* Get states (all errors checked above) */
|
|
trace_event_iter_init(&iter, name);
|
|
while ((ev = trace_event_iter_next(&iter)) != NULL) {
|
|
TraceEventInfoList *elem;
|
|
bool is_vcpu = trace_event_is_vcpu(ev);
|
|
if (has_vcpu && !is_vcpu) {
|
|
continue;
|
|
}
|
|
|
|
elem = g_new(TraceEventInfoList, 1);
|
|
elem->value = g_new(TraceEventInfo, 1);
|
|
elem->value->vcpu = is_vcpu;
|
|
elem->value->name = g_strdup(trace_event_get_name(ev));
|
|
|
|
if (!trace_event_get_state_static(ev)) {
|
|
elem->value->state = TRACE_EVENT_STATE_UNAVAILABLE;
|
|
} else {
|
|
if (has_vcpu) {
|
|
if (is_vcpu) {
|
|
if (trace_event_get_vcpu_state_dynamic(cpu, ev)) {
|
|
elem->value->state = TRACE_EVENT_STATE_ENABLED;
|
|
} else {
|
|
elem->value->state = TRACE_EVENT_STATE_DISABLED;
|
|
}
|
|
}
|
|
/* else: already skipped above */
|
|
} else {
|
|
if (trace_event_get_state_dynamic(ev)) {
|
|
elem->value->state = TRACE_EVENT_STATE_ENABLED;
|
|
} else {
|
|
elem->value->state = TRACE_EVENT_STATE_DISABLED;
|
|
}
|
|
}
|
|
}
|
|
elem->next = events;
|
|
events = elem;
|
|
}
|
|
|
|
return events;
|
|
}
|
|
|
|
void qmp_trace_event_set_state(const char *name, bool enable,
|
|
bool has_ignore_unavailable, bool ignore_unavailable,
|
|
bool has_vcpu, int64_t vcpu,
|
|
Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
TraceEventIter iter;
|
|
TraceEvent *ev;
|
|
bool is_pattern = trace_event_is_pattern(name);
|
|
CPUState *cpu;
|
|
|
|
/* Check provided vcpu */
|
|
cpu = get_cpu(has_vcpu, vcpu, &err);
|
|
if (err) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
/* Check events */
|
|
if (!check_events(has_vcpu, has_ignore_unavailable && ignore_unavailable,
|
|
is_pattern, name, errp)) {
|
|
return;
|
|
}
|
|
|
|
/* Apply changes (all errors checked above) */
|
|
trace_event_iter_init(&iter, name);
|
|
while ((ev = trace_event_iter_next(&iter)) != NULL) {
|
|
if (!trace_event_get_state_static(ev) ||
|
|
(has_vcpu && !trace_event_is_vcpu(ev))) {
|
|
continue;
|
|
}
|
|
if (has_vcpu) {
|
|
trace_event_set_vcpu_state_dynamic(cpu, ev, enable);
|
|
} else {
|
|
trace_event_set_state_dynamic(ev, enable);
|
|
}
|
|
}
|
|
}
|