From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754711AbbHFHCB (ORCPT ); Thu, 6 Aug 2015 03:02:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55912 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbbHFHB7 (ORCPT ); Thu, 6 Aug 2015 03:01:59 -0400 Date: Thu, 6 Aug 2015 00:01:42 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mail@milianw.de, bp@suse.de, namhyung@kernel.org, mingo@kernel.org, hpa@zytor.com, dsahern@gmail.com, acme@redhat.com, eranian@google.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de Reply-To: bp@suse.de, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, hpa@zytor.com, mail@milianw.de, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, eranian@google.com, fweisbec@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Use a constant for the syscall formatting buffer Git-Commit-ID: e4d44e830a4bbeb0cf6fdd24c24794a2e599e26d 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: e4d44e830a4bbeb0cf6fdd24c24794a2e599e26d Gitweb: http://git.kernel.org/tip/e4d44e830a4bbeb0cf6fdd24c24794a2e599e26d Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 4 Aug 2015 22:17:29 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Aug 2015 10:52:40 -0300 perf trace: Use a constant for the syscall formatting buffer We were using it as a magic number, 1024, fix that. Eventually we need to stop doing it per line, and do it per arg, traversing the args at output time, to avoid the memmove() calls that will be used in the next cset to replace pointers present at raw_syscalls:sys_enter time with its contents that appear at probe:vfs_getname time, before raw_syscalls:sys_exit time. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-4sz3wid39egay1pp8qmbur4u@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index aa1e288..12d6fc0 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1262,6 +1262,8 @@ fail: #define TRACE_PFMAJ (1 << 0) #define TRACE_PFMIN (1 << 1) +static const size_t trace__entry_str_size = 2048; + struct trace { struct perf_tool tool; struct { @@ -1822,7 +1824,7 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel, args = perf_evsel__sc_tp_ptr(evsel, args, sample); if (ttrace->entry_str == NULL) { - ttrace->entry_str = malloc(1024); + ttrace->entry_str = malloc(trace__entry_str_size); if (!ttrace->entry_str) goto out_put; } @@ -1832,9 +1834,9 @@ static int trace__sys_enter(struct trace *trace, struct perf_evsel *evsel, ttrace->entry_time = sample->time; msg = ttrace->entry_str; - printed += scnprintf(msg + printed, 1024 - printed, "%s(", sc->name); + printed += scnprintf(msg + printed, trace__entry_str_size - printed, "%s(", sc->name); - printed += syscall__scnprintf_args(sc, msg + printed, 1024 - printed, + printed += syscall__scnprintf_args(sc, msg + printed, trace__entry_str_size - printed, args, trace, thread); if (sc->is_exit) {