From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760691AbcCEIRZ (ORCPT ); Sat, 5 Mar 2016 03:17:25 -0500 Received: from torg.zytor.com ([198.137.202.12]:58728 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751478AbcCEIRT (ORCPT ); Sat, 5 Mar 2016 03:17:19 -0500 Date: Sat, 5 Mar 2016 00:16:41 -0800 From: tip-bot for Wang Nan Message-ID: Cc: peterz@infradead.org, acme@redhat.com, hekuang@huawei.com, ast@kernel.org, jolsa@kernel.org, lizefan@huawei.com, namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, mingo@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com Reply-To: masami.hiramatsu.pt@hitachi.com, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, wangnan0@huawei.com, mingo@kernel.org, hekuang@huawei.com, ast@kernel.org, peterz@infradead.org, acme@redhat.com, lizefan@huawei.com, jolsa@kernel.org In-Reply-To: <1456479154-136027-23-git-send-email-wangnan0@huawei.com> References: <1456479154-136027-23-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Introduce record__finish_output() to finish a perf.data Git-Commit-ID: e1ab48ba63ee6b2494a67bb60bf99692ecdaca7c 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: e1ab48ba63ee6b2494a67bb60bf99692ecdaca7c Gitweb: http://git.kernel.org/tip/e1ab48ba63ee6b2494a67bb60bf99692ecdaca7c Author: Wang Nan AuthorDate: Fri, 26 Feb 2016 09:32:10 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 3 Mar 2016 11:10:35 -0300 perf record: Introduce record__finish_output() to finish a perf.data Move code for finalizing 'perf.data' to record__finish_output(). It will be used by following commits to split output to multiple files. Signed-off-by: He Kuang Cc: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1456479154-136027-23-git-send-email-wangnan0@huawei.com Signed-off-by: Wang Nan Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index cb583b4..46e2772 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -468,6 +468,29 @@ static void record__init_features(struct record *rec) perf_header__clear_feat(&session->header, HEADER_STAT); } +static void +record__finish_output(struct record *rec) +{ + struct perf_data_file *file = &rec->file; + int fd = perf_data_file__fd(file); + + if (file->is_pipe) + return; + + rec->session->header.data_size += rec->bytes_written; + file->size = lseek(perf_data_file__fd(file), 0, SEEK_CUR); + + if (!rec->no_buildid) { + process_buildids(rec); + + if (rec->buildid_all) + dsos__hit_all(rec->session); + } + perf_session__write_header(rec->session, rec->evlist, fd, true); + + return; +} + static volatile int workload_exec_errno; /* @@ -785,18 +808,8 @@ out_child: /* this will be recalculated during process_buildids() */ rec->samples = 0; - if (!err && !file->is_pipe) { - rec->session->header.data_size += rec->bytes_written; - file->size = lseek(perf_data_file__fd(file), 0, SEEK_CUR); - - if (!rec->no_buildid) { - process_buildids(rec); - - if (rec->buildid_all) - dsos__hit_all(rec->session); - } - perf_session__write_header(rec->session, rec->evlist, fd, true); - } + if (!err) + record__finish_output(rec); if (!err && !quiet) { char samples[128];