From 599ab2f241ee6693ea0a2700210718327b346f7f Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 4 Oct 2016 14:35:44 +0100 Subject: [PATCH] trace: remove some now unused functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The trace_event_count, trace_event_id and trace_event_pattern methods are no longer required now that everything is using the iterator APIs The trace_event_set_state and trace_event_set_vcpu_state macros were also unused. Reviewed-by: Stefan Hajnoczi Reviewed-by: Lluís Vilanova Signed-off-by: Daniel P. Berrange Message-id: 1475588159-30598-6-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- trace/control-internal.h | 11 -------- trace/control.c | 20 -------------- trace/control.h | 59 ---------------------------------------- 3 files changed, 90 deletions(-) diff --git a/trace/control-internal.h b/trace/control-internal.h index a4e5f4aa06..7f31e39059 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -20,17 +20,6 @@ extern uint16_t trace_events_dstate[]; extern int trace_events_enabled_count; -static inline TraceEventID trace_event_count(void) -{ - return TRACE_EVENT_COUNT; -} - -static inline TraceEvent *trace_event_id(TraceEventID id) -{ - assert(id < trace_event_count()); - return &trace_events[id]; -} - static inline bool trace_event_is_pattern(const char *str) { assert(str != NULL); diff --git a/trace/control.c b/trace/control.c index a107cc370f..a423f32eb0 100644 --- a/trace/control.c +++ b/trace/control.c @@ -102,26 +102,6 @@ static bool pattern_glob(const char *pat, const char *ev) } } -TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev) -{ - assert(pat != NULL); - - 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; - } - } - } - - return NULL; -} void trace_event_iter_init(TraceEventIter *iter, const char *pattern) { diff --git a/trace/control.h b/trace/control.h index 36d7cd23ed..10d4aba78c 100644 --- a/trace/control.h +++ b/trace/control.h @@ -52,21 +52,6 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern); */ TraceEvent *trace_event_iter_next(TraceEventIter *iter); -/** - * trace_event_id: - * @id: Event identifier. - * - * Get an event by its identifier. - * - * This routine has a constant cost, as opposed to trace_event_name and - * trace_event_pattern. - * - * Pre-conditions: The identifier is valid. - * - * Returns: pointer to #TraceEvent. - * - */ -static TraceEvent *trace_event_id(TraceEventID id); /** * trace_event_name: @@ -78,17 +63,6 @@ static TraceEvent *trace_event_id(TraceEventID id); */ TraceEvent *trace_event_name(const char *name); -/** - * trace_event_pattern: - * @pat: Event name pattern. - * @ev: Event to start searching from (not included). - * - * Get all events with a given name pattern. - * - * Returns: pointer to #TraceEvent or NULL if not found. - */ -TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev); - /** * trace_event_is_pattern: * @@ -96,14 +70,6 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev); */ static bool trace_event_is_pattern(const char *str); -/** - * trace_event_count: - * - * Return the number of events. - */ -static TraceEventID trace_event_count(void); - - /** * trace_event_get_id: @@ -194,31 +160,6 @@ static bool trace_event_get_state_dynamic(TraceEvent *ev); */ static bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu, TraceEvent *ev); -/** - * trace_event_set_state: - * - * Set the tracing state of an event (only if possible). - */ -#define trace_event_set_state(id, state) \ - do { \ - if ((id ##_ENABLED)) { \ - TraceEvent *_e = trace_event_id(id); \ - trace_event_set_state_dynamic(_e, state); \ - } \ - } while (0) - -/** - * trace_event_set_vcpu_state: - * - * Set the tracing state of an event for the given vCPU (only if not disabled). - */ -#define trace_event_set_vcpu_state(vcpu, id, state) \ - do { \ - if ((id ##_ENABLED)) { \ - TraceEvent *_e = trace_event_id(id); \ - trace_event_set_vcpu_state_dynamic(vcpu, _e, state); \ - } \ - } while (0) /** * trace_event_set_state_dynamic: -- 2.39.5