[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 04/20] trace: remove some now unused functions
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 04/20] trace: remove some now unused functions |
Date: |
Wed, 12 Oct 2016 10:47:22 +0200 |
From: "Daniel P. Berrange" <address@hidden>
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 <address@hidden>
Reviewed-by: LluĂs Vilanova <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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;
-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 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)
}
}
-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 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);
-/**
- * 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:
@@ -79,31 +64,12 @@ 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:
*
* Whether the given string is an event name pattern.
*/
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.7.4
- [Qemu-devel] [PULL v2 00/20] Tracing patches, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 01/20] trace: move colo trace events to net/ sub-directory, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 04/20] trace: remove some now unused functions,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 02/20] trace: add trace event iterator APIs, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 03/20] trace: convert code to use event iterators, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 05/20] trace: remove global 'uint16 dstate[]' array, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 06/20] trace: remove duplicate control.h includes in generated-tracers.h, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 07/20] trace: break circular dependency in event-internal.h, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 08/20] trace: give each trace event a named TraceEvent struct, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 09/20] trace: remove the TraceEventID and TraceEventVCPUID enums, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 10/20] trace: emit name <-> ID mapping in simpletrace header, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 11/20] trace: don't abort qemu if ftrace can't be initialized, Stefan Hajnoczi, 2016/10/12
- [Qemu-devel] [PULL v2 12/20] trace: provide mechanism for registering trace events, Stefan Hajnoczi, 2016/10/12