lkml.org 
[lkml]   [2013]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf util: Use evsel-> name to get tracepoint_paths
    Commit-ID:  e7c93f09b83be25281cf129674e0035664715033
    Gitweb: http://git.kernel.org/tip/e7c93f09b83be25281cf129674e0035664715033
    Author: Namhyung Kim <namhyung.kim@lge.com>
    AuthorDate: Wed, 26 Jun 2013 16:14:05 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Fri, 12 Jul 2013 13:46:02 -0300

    perf util: Use evsel->name to get tracepoint_paths

    Most tracepoint events already have their system and event name in
    ->name field so that searching whole event tracing directory for each
    evsel to match given id is suboptimal.

    Factor out this routine into tracepoint_name_to_path(). In case of en
    invalid name, it'll try to find path using id again.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/r/1372230862-15861-3-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/parse-events.c | 23 +++++++++++++++++++++++
    tools/perf/util/parse-events.h | 1 +
    tools/perf/util/trace-event-info.c | 15 +++++++++++++++
    3 files changed, 39 insertions(+)

    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index 995fc25..ef72e98 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -217,6 +217,29 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
    return NULL;
    }

    +struct tracepoint_path *tracepoint_name_to_path(const char *name)
    +{
    + struct tracepoint_path *path = zalloc(sizeof(*path));
    + char *str = strchr(name, ':');
    +
    + if (path == NULL || str == NULL) {
    + free(path);
    + return NULL;
    + }
    +
    + path->system = strndup(name, str - name);
    + path->name = strdup(str+1);
    +
    + if (path->system == NULL || path->name == NULL) {
    + free(path->system);
    + free(path->name);
    + free(path);
    + path = NULL;
    + }
    +
    + return path;
    +}
    +
    const char *event_type(int type)
    {
    switch (type) {
    diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
    index 8a48593..080f7cf 100644
    --- a/tools/perf/util/parse-events.h
    +++ b/tools/perf/util/parse-events.h
    @@ -23,6 +23,7 @@ struct tracepoint_path {
    };

    extern struct tracepoint_path *tracepoint_id_to_path(u64 config);
    +extern struct tracepoint_path *tracepoint_name_to_path(const char *name);
    extern bool have_tracepoints(struct list_head *evlist);

    const char *event_type(int type);
    diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
    index 615c062..a42624a 100644
    --- a/tools/perf/util/trace-event-info.c
    +++ b/tools/perf/util/trace-event-info.c
    @@ -414,12 +414,27 @@ get_tracepoints_path(struct list_head *pattrs)
    if (pos->attr.type != PERF_TYPE_TRACEPOINT)
    continue;
    ++nr_tracepoints;
    +
    + if (pos->name) {
    + ppath->next = tracepoint_name_to_path(pos->name);
    + if (ppath->next)
    + goto next;
    +
    + if (strchr(pos->name, ':') == NULL)
    + goto try_id;
    +
    + goto error;
    + }
    +
    +try_id:
    ppath->next = tracepoint_id_to_path(pos->attr.config);
    if (!ppath->next) {
    +error:
    pr_debug("No memory to alloc tracepoints list\n");
    put_tracepoints_path(&path);
    return NULL;
    }
    +next:
    ppath = ppath->next;
    }


    \
     
     \ /
      Last update: 2013-07-19 10:21    [W:3.805 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site