Skip to content

Commit

Permalink
trace: convert code to use event iterators
Browse files Browse the repository at this point in the history 
This converts the HMP/QMP monitor API implementations
and some internal trace control methods to use the new
trace event iterator APIs.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
Message-id: 1475588159-30598-5-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
@berrange @stefanhaRH
berrange authored and stefanhaRH committed Oct 12, 2016
1 parent 6a1b0f3 commit 0d4e995
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 58 deletions.
26 changes: 14 additions & 12 deletions monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3330,13 +3330,14 @@ void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *st
len = strlen(str);
readline_set_completion_index(rs, len);
if (nb_args == 2) {
TraceEventID id;
for (id = 0; id < trace_event_count(); id++) {
const char *event_name = trace_event_get_name(trace_event_id(id));
if (!strncmp(str, event_name, len)) {
readline_add_completion(rs, event_name);
}
TraceEventIter iter;
TraceEvent *ev;
char *pattern = g_strdup_printf("%s*", str);
trace_event_iter_init(&iter, pattern);
while ((ev = trace_event_iter_next(&iter)) != NULL) {
readline_add_completion(rs, trace_event_get_name(ev));
}
g_free(pattern);
}
}

Expand All @@ -3347,13 +3348,14 @@ void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
len = strlen(str);
readline_set_completion_index(rs, len);
if (nb_args == 2) {
TraceEventID id;
for (id = 0; id < trace_event_count(); id++) {
const char *event_name = trace_event_get_name(trace_event_id(id));
if (!strncmp(str, event_name, len)) {
readline_add_completion(rs, event_name);
}
TraceEventIter iter;
TraceEvent *ev;
char *pattern = g_strdup_printf("%s*", str);
trace_event_iter_init(&iter, pattern);
while ((ev = trace_event_iter_next(&iter)) != NULL) {
readline_add_completion(rs, trace_event_get_name(ev));
}
g_free(pattern);
} else if (nb_args == 3) {
add_completion_option(rs, str, "on");
add_completion_option(rs, str, "off");
Expand Down
8 changes: 4 additions & 4 deletions trace/control-target.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ static bool adding_first_cpu(void)

void trace_init_vcpu(CPUState *vcpu)
{
TraceEvent *ev = NULL;

while ((ev = trace_event_pattern("*", ev)) != NULL) {
TraceEventIter iter;
TraceEvent *ev;
trace_event_iter_init(&iter, NULL);
while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (trace_event_is_vcpu(ev) &&
trace_event_get_state_static(ev) &&
trace_event_get_state_dynamic(ev)) {
Expand All @@ -118,6 +119,5 @@ void trace_init_vcpu(CPUState *vcpu)
}
}
}

trace_guest_cpu_enter(vcpu);
}
77 changes: 41 additions & 36 deletions trace/control.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ TraceEvent *trace_event_name(const char *name)
{
assert(name != NULL);

TraceEventID i;
for (i = 0; i < trace_event_count(); i++) {
TraceEvent *ev = trace_event_id(i);
TraceEventIter iter;
TraceEvent *ev;
trace_event_iter_init(&iter, NULL);
while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (strcmp(trace_event_get_name(ev), name) == 0) {
return ev;
}
Expand Down Expand Up @@ -105,21 +106,18 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
{
assert(pat != NULL);

TraceEventID i;

if (ev == NULL) {
i = -1;
} else {
i = trace_event_get_id(ev);
}
i++;

while (i < trace_event_count()) {
TraceEvent *res = trace_event_id(i);
if (pattern_glob(pat, trace_event_get_name(res))) {
return res;
bool matched = ev ? false : true;
TraceEventIter iter;
TraceEvent *thisev;
trace_event_iter_init(&iter, pat);
while ((thisev = trace_event_iter_next(&iter)) != NULL) {
if (matched) {
return thisev;
} else {
if (ev == thisev) {
matched = true;
}
}
i++;
}

return NULL;
Expand Down Expand Up @@ -148,37 +146,44 @@ TraceEvent *trace_event_iter_next(TraceEventIter *iter)

void trace_list_events(void)
{
int i;
for (i = 0; i < trace_event_count(); i++) {
TraceEvent *res = trace_event_id(i);
fprintf(stderr, "%s\n", trace_event_get_name(res));
TraceEventIter iter;
TraceEvent *ev;
trace_event_iter_init(&iter, NULL);
while ((ev = trace_event_iter_next(&iter)) != NULL) {
fprintf(stderr, "%s\n", trace_event_get_name(ev));
}
}

static void do_trace_enable_events(const char *line_buf)
{
const bool enable = ('-' != line_buf[0]);
const char *line_ptr = enable ? line_buf : line_buf + 1;
TraceEventIter iter;
TraceEvent *ev;
bool is_pattern = trace_event_is_pattern(line_ptr);

if (trace_event_is_pattern(line_ptr)) {
TraceEvent *ev = NULL;
while ((ev = trace_event_pattern(line_ptr, ev)) != NULL) {
if (trace_event_get_state_static(ev)) {
trace_event_set_state_dynamic_init(ev, enable);
trace_event_iter_init(&iter, line_ptr);
while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (!trace_event_get_state_static(ev)) {
if (!is_pattern) {
error_report("WARNING: trace event '%s' is not traceable",
line_ptr);
return;
}
continue;
}
} else {
TraceEvent *ev = trace_event_name(line_ptr);
if (ev == NULL) {
error_report("WARNING: trace event '%s' does not exist",
line_ptr);
} else if (!trace_event_get_state_static(ev)) {
error_report("WARNING: trace event '%s' is not traceable",
line_ptr);
} else {
trace_event_set_state_dynamic_init(ev, enable);

/* start tracing */
trace_event_set_state_dynamic(ev, enable);
if (!is_pattern) {
return;
}
}

if (!is_pattern) {
error_report("WARNING: trace event '%s' does not exist",
line_ptr);
}
}

void trace_enable_events(const char *line_buf)
Expand Down
16 changes: 10 additions & 6 deletions trace/qmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ static bool check_events(bool has_vcpu, bool ignore_unavailable, bool is_pattern
return true;
} else {
/* error for unavailable events */
TraceEvent *ev = NULL;
while ((ev = trace_event_pattern(name, ev)) != NULL) {
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;
Expand All @@ -69,6 +71,7 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
{
Error *err = NULL;
TraceEventInfoList *events = NULL;
TraceEventIter iter;
TraceEvent *ev;
bool is_pattern = trace_event_is_pattern(name);
CPUState *cpu;
Expand All @@ -86,8 +89,8 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
}

/* Get states (all errors checked above) */
ev = NULL;
while ((ev = trace_event_pattern(name, ev)) != NULL) {
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) {
Expand Down Expand Up @@ -132,6 +135,7 @@ void qmp_trace_event_set_state(const char *name, bool enable,
Error **errp)
{
Error *err = NULL;
TraceEventIter iter;
TraceEvent *ev;
bool is_pattern = trace_event_is_pattern(name);
CPUState *cpu;
Expand All @@ -150,8 +154,8 @@ void qmp_trace_event_set_state(const char *name, bool enable,
}

/* Apply changes (all errors checked above) */
ev = NULL;
while ((ev = trace_event_pattern(name, ev)) != NULL) {
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;
Expand Down

0 comments on commit 0d4e995

Please sign in to comment.