From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752588AbcEAHl2 (ORCPT ); Sun, 1 May 2016 03:41:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40416 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483AbcEAHl0 (ORCPT ); Sun, 1 May 2016 03:41:26 -0400 Date: Sun, 1 May 2016 00:41:05 -0700 From: tip-bot for Wang Nan Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, jolsa@redhat.com, mingo@kernel.org, mhiramat@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, namhyung@kernel.org, hekuang@huawei.com, lizefan@huawei.com, adrian.hunter@intel.com, acme@redhat.com Reply-To: jolsa@redhat.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mhiramat@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, namhyung@kernel.org, hekuang@huawei.com, lizefan@huawei.com, adrian.hunter@intel.com, acme@redhat.com In-Reply-To: <1461178794-40467-8-git-send-email-wangnan0@huawei.com> References: <1461178794-40467-8-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Generate tracking events for process forked by perf Git-Commit-ID: be7b0c9e376e93a00b6c8631e2721e9dc7c6a1fa 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: be7b0c9e376e93a00b6c8631e2721e9dc7c6a1fa Gitweb: http://git.kernel.org/tip/be7b0c9e376e93a00b6c8631e2721e9dc7c6a1fa Author: Wang Nan AuthorDate: Wed, 20 Apr 2016 18:59:54 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 28 Apr 2016 09:58:59 -0300 perf record: Generate tracking events for process forked by perf With 'perf record --switch-output' without -a, record__synthesize() in record__switch_output() won't generate tracking events because there's no thread_map in evlist. Which causes newly created perf.data doesn't contain map and comm information. This patch creates a fake thread_map and directly call perf_event__synthesize_thread_map() for those events. Signed-off-by: Wang Nan Tested-by: Arnaldo Carvalho de Melo Cc: Adrian Hunter Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1461178794-40467-8-git-send-email-wangnan0@huawei.com Signed-off-by: He Kuang Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 178b49e..f3679c4 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -500,6 +500,23 @@ record__finish_output(struct record *rec) return; } +static int record__synthesize_workload(struct record *rec) +{ + struct { + struct thread_map map; + struct thread_map_data map_data; + } thread_map; + + thread_map.map.nr = 1; + thread_map.map.map[0].pid = rec->evlist->workload.pid; + thread_map.map.map[0].comm = NULL; + return perf_event__synthesize_thread_map(&rec->tool, &thread_map.map, + process_synthesized_event, + &rec->session->machines.host, + rec->opts.sample_address, + rec->opts.proc_map_timeout); +} + static int record__synthesize(struct record *rec); static int @@ -532,9 +549,21 @@ record__switch_output(struct record *rec, bool at_exit) file->path, timestamp); /* Output tracking events */ - if (!at_exit) + if (!at_exit) { record__synthesize(rec); + /* + * In 'perf record --switch-output' without -a, + * record__synthesize() in record__switch_output() won't + * generate tracking events because there's no thread_map + * in evlist. Which causes newly created perf.data doesn't + * contain map and comm information. + * Create a fake thread_map and directly call + * perf_event__synthesize_thread_map() for those events. + */ + if (target__none(&rec->opts.target)) + record__synthesize_workload(rec); + } return fd; }