From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brPtP-0004Wr-S7 for qemu-devel@nongnu.org; Tue, 04 Oct 2016 09:36:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brPtL-00047T-KS for qemu-devel@nongnu.org; Tue, 04 Oct 2016 09:36:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brPtL-000475-AM for qemu-devel@nongnu.org; Tue, 04 Oct 2016 09:36:19 -0400 From: "Daniel P. Berrange" Date: Tue, 4 Oct 2016 14:35:44 +0100 Message-Id: <1475588159-30598-6-git-send-email-berrange@redhat.com> In-Reply-To: <1475588159-30598-1-git-send-email-berrange@redhat.com> References: <1475588159-30598-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 05/20] trace: remove some now unused functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi , "Daniel P. Berrange" 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=C3=ADs Vilanova Signed-off-by: Daniel P. Berrange --- 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 a4e5f4a..7f31e39 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; =20 =20 -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 !=3D NULL); diff --git a/trace/control.c b/trace/control.c index a107cc3..a423f32 100644 --- a/trace/control.c +++ b/trace/control.c @@ -102,26 +102,6 @@ static bool pattern_glob(const char *pat, const char= *ev) } } =20 -TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev) -{ - assert(pat !=3D NULL); - - bool matched =3D ev ? false : true; - TraceEventIter iter; - TraceEvent *thisev; - trace_event_iter_init(&iter, pat); - while ((thisev =3D trace_event_iter_next(&iter)) !=3D NULL) { - if (matched) { - return thisev; - } else { - if (ev =3D=3D thisev) { - matched =3D true; - } - } - } - - return NULL; -} =20 void trace_event_iter_init(TraceEventIter *iter, const char *pattern) { diff --git a/trace/control.h b/trace/control.h index 36d7cd2..10d4aba 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); =20 -/** - * 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); =20 /** * trace_event_name: @@ -79,31 +64,12 @@ static TraceEvent *trace_event_id(TraceEventID id); TraceEvent *trace_event_name(const char *name); =20 /** - * 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: * * Whether the given string is an event name pattern. */ static bool trace_event_is_pattern(const char *str); =20 -/** - * trace_event_count: - * - * Return the number of events. - */ -static TraceEventID trace_event_count(void); - - =20 /** * 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, TraceEven= t *ev); =20 -/** - * 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 =3D 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 dis= abled). - */ -#define trace_event_set_vcpu_state(vcpu, id, state) = \ - do { = \ - if ((id ##_ENABLED)) { = \ - TraceEvent *_e =3D trace_event_id(id); = \ - trace_event_set_vcpu_state_dynamic(vcpu, _e, state); = \ - } = \ - } while (0) =20 /** * trace_event_set_state_dynamic: --=20 2.7.4