lkml.org 
[lkml]   [2011]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] perf tools: Fix tracepoint id to string perf.data header table
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    It was broken by f006d25 that passed just the event name, not the complete
    sys:event that it expected to open the /sys/.../sys/sys:event/id file to get
    the id.

    Fix it by moving it to after parse_events in cmd_record, as at that point
    we can just traverse the evsel_list and use evsel->attr.config +
    event_name(evsel) instead of re-opening the /id file.

    Reported-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
    Cc: Franck Bui-Huu <vagabon.xyz@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Han Pingtian <phan@redhat.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Tom Zanussi <tzanussi@gmail.com>
    LKML-Reference: <20110117202801.GG2085@ghostprotocols.net>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-record.c | 2 ++
    tools/perf/util/parse-events.c | 29 -----------------------------
    2 files changed, 2 insertions(+), 29 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index df6064a..fcd29e8 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -936,6 +936,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
    list_for_each_entry(pos, &evsel_list, node) {
    if (perf_evsel__alloc_fd(pos, cpus->nr, threads->nr) < 0)
    goto out_free_fd;
    + if (perf_header__push_event(pos->attr.config, event_name(pos)))
    + goto out_free_fd;
    }
    event_array = malloc((sizeof(struct pollfd) * MAX_NR_CPUS *
    MAX_COUNTERS * threads->nr));
    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index 1f4cfe5..bc2732e 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -490,32 +490,6 @@ parse_multiple_tracepoint_event(char *sys_name, const char *evt_exp,
    return EVT_HANDLED_ALL;
    }

    -static int store_event_type(const char *orgname)
    -{
    - char filename[PATH_MAX], *c;
    - FILE *file;
    - int id, n;
    -
    - sprintf(filename, "%s/", debugfs_path);
    - strncat(filename, orgname, strlen(orgname));
    - strcat(filename, "/id");
    -
    - c = strchr(filename, ':');
    - if (c)
    - *c = '/';
    -
    - file = fopen(filename, "r");
    - if (!file)
    - return 0;
    - n = fscanf(file, "%i", &id);
    - fclose(file);
    - if (n < 1) {
    - pr_err("cannot store event ID\n");
    - return -EINVAL;
    - }
    - return perf_header__push_event(id, orgname);
    -}
    -
    static enum event_result parse_tracepoint_event(const char **strp,
    struct perf_event_attr *attr)
    {
    @@ -559,9 +533,6 @@ static enum event_result parse_tracepoint_event(const char **strp,
    return parse_multiple_tracepoint_event(sys_name, evt_name,
    flags);
    } else {
    - if (store_event_type(evt_name) < 0)
    - return EVT_FAILED;
    -
    return parse_single_tracepoint_event(sys_name, evt_name,
    evt_length, attr, strp);
    }
    --
    1.6.2.5


    \
     
     \ /
      Last update: 2011-01-18 02:13    [W:0.050 / U:0.144 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site