lkml.org 
[lkml]   [2013]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/34] perf script: Move evname print code to process_event()
    Date
    From: Namhyung Kim <namhyung@kernel.org>

    The print_sample_start() will be reused by other printing routine for
    internal events like COMM, FORK and EXIT from next patch. And because
    they're not tied to a specific event, move the evname print code to its
    caller.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Reviewed-by: David Ahern <dsahern@gmail.com>
    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: Namhyung Kim <namhyung.kim@lge.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1384752894-10974-1-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-script.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
    index baf17989a216..b392770766dd 100644
    --- a/tools/perf/builtin-script.c
    +++ b/tools/perf/builtin-script.c
    @@ -288,7 +288,6 @@ static void print_sample_start(struct perf_sample *sample,
    struct perf_evsel *evsel)
    {
    struct perf_event_attr *attr = &evsel->attr;
    - const char *evname = NULL;
    unsigned long secs;
    unsigned long usecs;
    unsigned long long nsecs;
    @@ -323,11 +322,6 @@ static void print_sample_start(struct perf_sample *sample,
    usecs = nsecs / NSECS_PER_USEC;
    printf("%5lu.%06lu: ", secs, usecs);
    }
    -
    - if (PRINT_FIELD(EVNAME)) {
    - evname = perf_evsel__name(evsel);
    - printf("%s: ", evname ? evname : "[unknown]");
    - }
    }

    static bool is_bts_event(struct perf_event_attr *attr)
    @@ -434,6 +428,11 @@ static void process_event(union perf_event *event, struct perf_sample *sample,

    print_sample_start(sample, thread, evsel);

    + if (PRINT_FIELD(EVNAME)) {
    + const char *evname = perf_evsel__name(evsel);
    + printf("%s: ", evname ? evname : "[unknown]");
    + }
    +
    if (is_bts_event(attr)) {
    print_sample_bts(event, sample, evsel, machine, thread);
    return;
    --
    1.8.1.4


    \
     
     \ /
      Last update: 2013-11-27 22:21    [W:2.474 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site