Commit-ID: 69a77275926ccd0c08fde103de52b59f18370f5a Gitweb: http://git.kernel.org/tip/69a77275926ccd0c08fde103de52b59f18370f5a Author: Jiri Olsa <jo...@kernel.org> AuthorDate: Wed, 24 Feb 2016 09:46:49 +0100 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Wed, 24 Feb 2016 10:29:52 -0300
perf tools: Introduce perf_mem__lck_scnprintf function Move meminfo's lck display function into mem-events.c object, so it could be reused later from script code. Signed-off-by: Jiri Olsa <jo...@kernel.org> Cc: Andi Kleen <a...@linux.intel.com> Cc: David Ahern <dsah...@gmail.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Stephane Eranian <eran...@google.com> Link: http://lkml.kernel.org/r/1456303616-26926-9-git-send-email-jo...@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- 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 d03edc2..9844e3e 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -217,3 +217,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 6efdd6f..99678b5 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -28,4 +28,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 2007c3b..4175b29 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); }
