Re: [Qemu-devel] [PATCH v2 3/6] trace: remove some now unused functions

[Lluís Vilanova]

Daniel P Berrange writes:

> 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.

> Signed-off-by: Daniel P. Berrange <address@hidden>

Reviewed-by: Lluís Vilanova <address@hidden>


> ---
>  trace/control-internal.h | 11 ---------
>  trace/control.c          | 22 ------------------
>  trace/control.h          | 59 
> ------------------------------------------------
>  3 files changed, 92 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 8fa7ed6..e9a64d0 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -102,28 +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, NULL);
> -    while ((thisev = trace_event_iter_next(&iter)) != NULL) {
> -        if (matched) {
> -            if (pattern_glob(pat, trace_event_get_name(thisev))) {
> -                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 c71b405..e80c220 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