From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbcF2Jqm (ORCPT ); Wed, 29 Jun 2016 05:46:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34626 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbcF2Jqk (ORCPT ); Wed, 29 Jun 2016 05:46:40 -0400 Date: Wed, 29 Jun 2016 02:46:29 -0700 From: tip-bot for Wang Nan Message-ID: Cc: hpa@zytor.com, acme@redhat.com, lizefan@huawei.com, mingo@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org Reply-To: jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com, lizefan@huawei.com, mingo@kernel.org, wangnan0@huawei.com In-Reply-To: <1466767332-114472-5-git-send-email-wangnan0@huawei.com> References: <1466767332-114472-5-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf data ctf: Prepare collect non-sample events Git-Commit-ID: 8ee4c46c5ec2481dd18098c5604f791ff911d427 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: 8ee4c46c5ec2481dd18098c5604f791ff911d427 Gitweb: http://git.kernel.org/tip/8ee4c46c5ec2481dd18098c5604f791ff911d427 Author: Wang Nan AuthorDate: Fri, 24 Jun 2016 11:22:09 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Jun 2016 10:54:56 -0300 perf data ctf: Prepare collect non-sample events Following commits are going to allow 'perf data convert' to collect not only samples, but also non-sample events like comm and fork. In this patch we count non-sample events using c.non_sample_count, and prepare to print number of both type of events like: # ~/perf data convert --all --to-ctf ./out.ctf [ perf data convert: Converted 'perf.data' into CTF data './out.ctf' ] [ perf data convert: Converted and wrote 0.846 MB (6508 samples, 686 non-samples) ] Signed-off-by: Wang Nan Acked-by: Jiri Olsa Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1466767332-114472-5-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/data-convert-bt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c index 09571b3..3b3ac7c 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -77,6 +77,7 @@ struct convert { u64 events_size; u64 events_count; + u64 non_sample_count; /* Ordered events configured queue size. */ u64 queue_size; @@ -1369,10 +1370,15 @@ int bt_convert__perf2ctf(const char *input, const char *path, file.path, path); fprintf(stderr, - "[ perf data convert: Converted and wrote %.3f MB (%" PRIu64 " samples) ]\n", + "[ perf data convert: Converted and wrote %.3f MB (%" PRIu64 " samples", (double) c.events_size / 1024.0 / 1024.0, c.events_count); + if (!c.non_sample_count) + fprintf(stderr, ") ]\n"); + else + fprintf(stderr, ", %" PRIu64 " non-samples) ]\n", c.non_sample_count); + cleanup_events(session); perf_session__delete(session); ctf_writer__cleanup(cw);