lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/15] perf tools: Introduce perf_mem__lck_scnprintf function
    Date
    Move meminfo's lck display function into mem-events.c
    object, so it could be reused later from script code.

    Link: http://lkml.kernel.org/n/tip-qiwjnu0m6vzknv25t5ggund6@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/util/mem-events.c | 16 ++++++++++++++++
    tools/perf/util/mem-events.h | 2 ++
    tools/perf/util/sort.c | 14 ++------------
    3 files changed, 20 insertions(+), 12 deletions(-)

    diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
    index aacd16a670c8..3b16128234b7 100644
    --- a/tools/perf/util/mem-events.c
    +++ b/tools/perf/util/mem-events.c
    @@ -232,3 +232,19 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
    if (*out == '\0')
    strcpy(out, "N/A");
    }
    +
    +void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused,
    + struct mem_info *mem_info)
    +{
    + u64 mask = PERF_MEM_LOCK_NA;
    +
    + if (mem_info)
    + mask = mem_info->data_src.mem_lock;
    +
    + if (mask & PERF_MEM_LOCK_NA)
    + strncat(out, "N/A", 3);
    + else if (mask & PERF_MEM_LOCK_LOCKED)
    + strncat(out, "Yes", 3);
    + else
    + strncat(out, "No", 2);
    +}
    diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
    index 6f8ea2f8107b..06750f640586 100644
    --- a/tools/perf/util/mem-events.h
    +++ b/tools/perf/util/mem-events.h
    @@ -29,4 +29,6 @@ struct mem_info;
    void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
    void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
    void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
    +void perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
    +
    #endif /* __PERF_MEM_EVENTS_H */
    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index 2007c3b683f3..4175b2944ff9 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -795,19 +795,9 @@ sort__locked_cmp(struct hist_entry *left, struct hist_entry *right)
    static int hist_entry__locked_snprintf(struct hist_entry *he, char *bf,
    size_t size, unsigned int width)
    {
    - const char *out;
    - u64 mask = PERF_MEM_LOCK_NA;
    -
    - if (he->mem_info)
    - mask = he->mem_info->data_src.mem_lock;
    -
    - if (mask & PERF_MEM_LOCK_NA)
    - out = "N/A";
    - else if (mask & PERF_MEM_LOCK_LOCKED)
    - out = "Yes";
    - else
    - out = "No";
    + char out[10];

    + perf_mem__lck_scnprintf(out, sizeof(out), he->mem_info);
    return repsep_snprintf(bf, size, "%.*s", width, out);
    }

    --
    2.4.3
    \
     
     \ /
      Last update: 2016-02-24 10:21    [W:3.726 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site