From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759425AbcBYCG0 (ORCPT ); Wed, 24 Feb 2016 21:06:26 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:55011 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752373AbcBYB6g (ORCPT ); Wed, 24 Feb 2016 20:58:36 -0500 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Andi Kleen , David Ahern , Namhyung Kim , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo Subject: [PATCH 06/31] perf tools: Introduce perf_mem__lck_scnprintf function Date: Wed, 24 Feb 2016 22:58:01 -0300 Message-Id: <1456365506-5492-7-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456365506-5492-1-git-send-email-acme@kernel.org> References: <1456365506-5492-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa 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 Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1456303616-26926-9-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 d03edc2ec607..9844e3e36c1d 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 6efdd6fcdb01..99678b51c747 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 2007c3b683f3..4175b2944ff9 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); } -- 2.5.0