From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932716AbcBXIro (ORCPT ); Wed, 24 Feb 2016 03:47:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33678 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932593AbcBXIrl (ORCPT ); Wed, 24 Feb 2016 03:47:41 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , Stephane Eranian , Andi Kleen Subject: [PATCH 09/15] perf tools: Change perf_mem__tlb_scnprintf to return nb of displayed bytes Date: Wed, 24 Feb 2016 09:46:50 +0100 Message-Id: <1456303616-26926-10-git-send-email-jolsa@kernel.org> In-Reply-To: <1456303616-26926-1-git-send-email-jolsa@kernel.org> References: <1456303616-26926-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Moving strncat/strcpy calls into scnprintf to easily track number of displayed bytes. It will be used in following patch. Link: http://lkml.kernel.org/n/tip-9q9h9trua9zljnw26c56memh@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/mem-events.c | 13 +++++++------ 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 3b16128234b7..7a4fb7e8159d 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -110,7 +110,7 @@ static const char * const tlb_access[] = { "Fault", }; -void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info) +int perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info) { size_t l = 0, i; u64 m = PERF_MEM_TLB_NA; @@ -135,15 +135,16 @@ void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info) strcat(out, " or "); l += 4; } - strncat(out, tlb_access[i], sz - l); - l += strlen(tlb_access[i]); + l += scnprintf(out + l, sz - l, tlb_access[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 mem_lvl[] = { diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 06750f640586..c6fb8a741fbb 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -26,7 +26,7 @@ int perf_mem_events__init(void); char *perf_mem_events__name(int i); struct mem_info; -void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *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); 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); -- 2.4.3