From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932366AbcBYHjI (ORCPT ); Thu, 25 Feb 2016 02:39:08 -0500 Received: from torg.zytor.com ([198.137.202.12]:57002 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759389AbcBYHjG (ORCPT ); Thu, 25 Feb 2016 02:39:06 -0500 Date: Wed, 24 Feb 2016 23:38:49 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: eranian@google.com, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, ak@linux.intel.com, tglx@linutronix.de Reply-To: eranian@google.com, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, ak@linux.intel.com, tglx@linutronix.de In-Reply-To: <1456303616-26926-11-git-send-email-jolsa@kernel.org> References: <1456303616-26926-11-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Change perf_mem__lvl_scnprintf to return nb of displayed bytes Git-Commit-ID: 969075630e3abd1c740ac4f3183949cbf54b410d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 969075630e3abd1c740ac4f3183949cbf54b410d Gitweb: http://git.kernel.org/tip/969075630e3abd1c740ac4f3183949cbf54b410d Author: Jiri Olsa AuthorDate: Wed, 24 Feb 2016 09:46:51 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 24 Feb 2016 10:30:14 -0300 perf tools: Change perf_mem__lvl_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 Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1456303616-26926-11-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 b58d32e..249250f 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -149,7 +149,7 @@ static const char * const mem_lvl[] = { "Uncached", }; -void perf_mem__lvl_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) { size_t i, l = 0; u64 m = PERF_MEM_LVL_NA; @@ -174,15 +174,16 @@ void perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info) strcat(out, " or "); l += 4; } - strncat(out, mem_lvl[i], sz - l); - l += strlen(mem_lvl[i]); + l += scnprintf(out + l, sz - l, mem_lvl[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 snoop_access[] = { diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index 4141df6..0467f67 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -26,7 +26,7 @@ char *perf_mem_events__name(int i); struct 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); +int 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);