diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2016-02-24 11:46:51 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-02-24 16:30:14 +0300 |
| commit | 969075630e3abd1c740ac4f3183949cbf54b410d (patch) | |
| tree | a5c0d4e858793b589f6505621a69c81e258788e1 | |
| parent | b1a5fbea3d69511e445b8d9efe6dc605edb508c8 (diff) | |
| download | linux-969075630e3abd1c740ac4f3183949cbf54b410d.tar.xz | |
perf tools: Change perf_mem__lvl_scnprintf to return nb of displayed bytes
Moving strncat/strcpy calls into scnprintf to easily track number of
displayed bytes. It will be used in following patch.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1456303616-26926-11-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/util/mem-events.c | 13 | ||||
| -rw-r--r-- | tools/perf/util/mem-events.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index b58d32e1c80a..249250f60481 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -149,7 +149,7 @@ static const char * const mem_lvl[] = { "Uncached", }; -void perf_mem__lvl_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) { size_t i, l = 0; u64 m = PERF_MEM_LVL_NA; @@ -174,15 +174,16 @@ void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info) strcat(out, " or "); l += 4; } - strncat(out, mem_lvl[i], sz - l); - l += strlen(mem_lvl[i]); + l += scnprintf(out + l, sz - l, mem_lvl[i]); } if (*out == '\0') - strcpy(out, "N/A"); + l += scnprintf(out, sz - l, "N/A"); if (hit) - strncat(out, " hit", sz - l); + l += scnprintf(out + l, sz - l, " hit"); if (miss) - strncat(out, " miss", sz - l); + l += scnprintf(out + l, sz - l, " miss"); + + return l; } static const char * const snoop_access[] = { diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 4141df6850e4..0467f6775dc2 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -26,7 +26,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); -void perf_mem__lvl_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); void perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info); |