summaryrefslogtreecommitdiff
path: root/tools/perf/util/mem-events.c
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2016-02-24 11:46:52 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-02-24 16:30:22 +0300
commit149d75076778d3b14e13b79d683b4f4fdd4fdb01 (patch)
tree14849d4b139ed5047c209a0129fd9c84c4636bed /tools/perf/util/mem-events.c
parent969075630e3abd1c740ac4f3183949cbf54b410d (diff)
downloadlinux-149d75076778d3b14e13b79d683b4f4fdd4fdb01.tar.xz
perf tools: Change perf_mem__snp_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-12-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/mem-events.c')
-rw-r--r--tools/perf/util/mem-events.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index 249250f60481..de981ddcd1d3 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -194,7 +194,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;
@@ -212,12 +212,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,