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 11/15] perf tools: Change perf_mem__snp_scnprintf to return nb of displayed bytes
    Date
    Moving strncat/strcpy calls into scnprintf to easily track
    number of displayed bytes. It will be used in following patch.

    Link: http://lkml.kernel.org/n/tip-dvtk0c7clgi857x699mk08ya@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/util/mem-events.c | 9 +++++----
    tools/perf/util/mem-events.h | 2 +-
    2 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
    index cd8241fea081..331cbec5100c 100644
    --- a/tools/perf/util/mem-events.c
    +++ b/tools/perf/util/mem-events.c
    @@ -209,7 +209,7 @@ static const char * const snoop_access[] = {
    "HitM",
    };

    -void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
    +int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
    {
    size_t i, l = 0;
    u64 m = PERF_MEM_SNOOP_NA;
    @@ -227,12 +227,13 @@ void perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info)
    strcat(out, " or ");
    l += 4;
    }
    - strncat(out, snoop_access[i], sz - l);
    - l += strlen(snoop_access[i]);
    + l += scnprintf(out + l, sz - l, snoop_access[i]);
    }

    if (*out == '\0')
    - strcpy(out, "N/A");
    + l += scnprintf(out, sz - l, "N/A");
    +
    + return l;
    }

    void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused,
    diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
    index 9b7a273aeeee..9289db6a6d5b 100644
    --- a/tools/perf/util/mem-events.h
    +++ b/tools/perf/util/mem-events.h
    @@ -28,7 +28,7 @@ char *perf_mem_events__name(int i);
    struct mem_info;
    int perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);
    int 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);
    +int 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 */
    --
    2.4.3
    \
     
     \ /
      Last update: 2016-02-24 10:21    [W:5.553 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site