Commit-ID: 8b0819c8a3c97279b815581b606407c0387cc26f Gitweb: http://git.kernel.org/tip/8b0819c8a3c97279b815581b606407c0387cc26f Author: Jiri Olsa <[email protected]> AuthorDate: Wed, 24 Feb 2016 09:46:53 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 24 Feb 2016 10:31:03 -0300
perf tools: Change perf_mem__lck_scnprintf to return nb of displayed bytes Moving strncat call into scnprintf to easily track number of displayed bytes. It will be used in following patch. Signed-off-by: Jiri Olsa <[email protected]> Cc: Andi Kleen <[email protected]> Cc: David Ahern <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/perf/util/mem-events.c | 12 +++++++----- tools/perf/util/mem-events.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index de981dd..eadb83d 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -221,18 +221,20 @@ int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info) return l; } -void perf_mem__lck_scnprintf(char *out, size_t sz __maybe_unused, - struct mem_info *mem_info) +int perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info) { u64 mask = PERF_MEM_LOCK_NA; + int l; if (mem_info) mask = mem_info->data_src.mem_lock; if (mask & PERF_MEM_LOCK_NA) - strncat(out, "N/A", 3); + l = scnprintf(out, sz, "N/A"); else if (mask & PERF_MEM_LOCK_LOCKED) - strncat(out, "Yes", 3); + l = scnprintf(out, sz, "Yes"); else - strncat(out, "No", 2); + l = scnprintf(out, sz, "No"); + + return l; } diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 84c79a4..87c44ff 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -28,6 +28,6 @@ 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); 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); +int perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info); #endif /* __PERF_MEM_EVENTS_H */
