Commit 599ab2f2 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Stefan Hajnoczi
Browse files

trace: remove some now unused functions 



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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-6-git-send-email-berrange@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 0d4e995c

trace/control-internal.h

+0 −11
Original line number Diff line number Diff line
@@ -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);

trace/control.c

+0 −20
Original line number Diff line number Diff line
@@ -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)

{

trace/control.h

+0 −59
Original line number Diff line number Diff line
@@ -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: