From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756646AbdJJRZP (ORCPT ); Tue, 10 Oct 2017 13:25:15 -0400 Received: from mga07.intel.com ([134.134.136.100]:44258 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756574AbdJJRUx (ORCPT ); Tue, 10 Oct 2017 13:20:53 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,359,1503385200"; d="scan'208";a="137137287" From: kan.liang@intel.com To: acme@kernel.org, peterz@infradead.org, mingo@redhat.com, linux-kernel@vger.kernel.org Cc: jolsa@kernel.org, wangnan0@huawei.com, hekuang@huawei.com, namhyung@kernel.org, alexander.shishkin@linux.intel.com, adrian.hunter@intel.com, ak@linux.intel.com, Kan Liang Subject: [PATCH 06/10] perf trace: apply new mmap_read interfaces Date: Tue, 10 Oct 2017 10:20:19 -0700 Message-Id: <1507656023-177125-7-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1507656023-177125-1-git-send-email-kan.liang@intel.com> References: <1507656023-177125-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang no functional change Signed-off-by: Kan Liang --- tools/perf/builtin-trace.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index afef6fe..cd5aaf2 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2424,8 +2424,14 @@ static int trace__run(struct trace *trace, int argc, const char **argv) for (i = 0; i < evlist->nr_mmaps; i++) { union perf_event *event; + struct perf_mmap_read read; - while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) { + if (perf_evlist__mmap_read_init(evlist, i, &read, false)) { + fprintf(trace->output, "Can't get mmap information\n"); + continue; + } + + while ((event = perf_mmap__read_event(&read)) != NULL) { struct perf_sample sample; ++trace->nr_events; @@ -2448,6 +2454,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) draining = true; } } + perf_mmap__read_done(&read); } if (trace->nr_events == before) { -- 2.5.5