From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774AbbBZLck (ORCPT ); Thu, 26 Feb 2015 06:32:40 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52118 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752762AbbBZLch (ORCPT ); Thu, 26 Feb 2015 06:32:37 -0500 Date: Thu, 26 Feb 2015 03:31:48 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dzickus@redhat.com, namhyung@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, jolsa@redhat.com, hpa@zytor.com, dsahern@gmail.com, fweisbec@gmail.com, eranian@google.com, bp@suse.de, acme@redhat.com, efault@gmx.de Reply-To: eranian@google.com, fweisbec@gmail.com, efault@gmx.de, bp@suse.de, acme@redhat.com, adrian.hunter@intel.com, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, dsahern@gmail.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, dzickus@redhat.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Filter out the trace pid when no threads are specified Git-Commit-ID: 241b057ce5c01a24c280f124fab60109cb562589 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: 241b057ce5c01a24c280f124fab60109cb562589 Gitweb: http://git.kernel.org/tip/241b057ce5c01a24c280f124fab60109cb562589 Author: Arnaldo Carvalho de Melo AuthorDate: Sat, 21 Feb 2015 10:15:21 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Sun, 22 Feb 2015 22:14:48 -0300 perf trace: Filter out the trace pid when no threads are specified To avoid tracing the tracer. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-shmwd1khzpaobr3i0j1ygapg@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 3a696aa..cb33e4c 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2151,6 +2151,15 @@ static int trace__run(struct trace *trace, int argc, const char **argv) if (err < 0) goto out_error_open; + /* + * Better not use !target__has_task() here because we need to cover the + * case where no threads were specified in the command line, but a + * workload was, and in that case we will fill in the thread_map when + * we fork the workload in perf_evlist__prepare_workload. + */ + if (evlist->threads->map[0] == -1) + perf_evlist__set_filter_pid(evlist, getpid()); + err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false); if (err < 0) goto out_error_mmap;