From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932761AbcBYHjq (ORCPT ); Thu, 25 Feb 2016 02:39:46 -0500 Received: from torg.zytor.com ([198.137.202.12]:57074 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932401AbcBYHjo (ORCPT ); Thu, 25 Feb 2016 02:39:44 -0500 Date: Wed, 24 Feb 2016 23:39:28 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, eranian@google.com, acme@redhat.com, tglx@linutronix.de, ak@linux.intel.com Reply-To: dsahern@gmail.com, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, eranian@google.com, ak@linux.intel.com, tglx@linutronix.de In-Reply-To: <1456303616-26926-13-git-send-email-jolsa@kernel.org> References: <1456303616-26926-13-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Change perf_mem__lck_scnprintf to return nb of displayed bytes Git-Commit-ID: 8b0819c8a3c97279b815581b606407c0387cc26f 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: 8b0819c8a3c97279b815581b606407c0387cc26f Gitweb: http://git.kernel.org/tip/8b0819c8a3c97279b815581b606407c0387cc26f Author: Jiri Olsa AuthorDate: Wed, 24 Feb 2016 09:46:53 +0100 Committer: Arnaldo Carvalho de Melo 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 Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1456303616-26926-13-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 */