From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DDD4C43381 for ; Sun, 10 Mar 2019 15:30:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C5F420657 for ; Sun, 10 Mar 2019 15:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552231844; bh=gKwavJztgwRqG8NGtZglngruY4eZ+Rq1QSPqqBxI89c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=daw9gr99dAVHNcTQFd/fm/0tuQ+N/91r/gogiqv1NKCYvCM5Pzg+RMTQuBUl2pHlR UTu8DPtZTx1CNJW/dTGD6iy0ISX44SrI8dCIPWtIzExTEMSmlOawL/a5i0dZNwhxsd PwpUpxd79lvNiI7QiQCw8Uk7rnZEJP6rqIfauroc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726620AbfCJPaf (ORCPT ); Sun, 10 Mar 2019 11:30:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51938 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725816AbfCJPae (ORCPT ); Sun, 10 Mar 2019 11:30:34 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 59C79307E049; Sun, 10 Mar 2019 15:30:33 +0000 (UTC) Received: from krava.brq.redhat.com (unknown [10.43.17.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id D268A60863; Sun, 10 Mar 2019 15:30:30 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Adrian Hunter , Andi Kleen , Stephane Eranian , Alexey Budankov Subject: [PATCH 1/5] perf session: Add __perf_session__process_dir_events function Date: Sun, 10 Mar 2019 16:30:22 +0100 Message-Id: <20190310153026.8661-2-jolsa@kernel.org> In-Reply-To: <20190310153026.8661-1-jolsa@kernel.org> References: <20190310153026.8661-1-jolsa@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Sun, 10 Mar 2019 15:30:33 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding __perf_session__process_dir_events function to process events over the directory data. All directory events are pushed into sessions ordered data and flushed for processing. Link: http://lkml.kernel.org/n/tip-n3zl0wo3z18tatv5x7epmjrh@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/session.c | 104 +++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 0ec34227bd60..b0c29a19f189 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1876,8 +1876,6 @@ reader__process_events(struct reader *rd, struct perf_session *session, file_offset = page_offset; head = rd->data_offset - page_offset; - ui_progress__init_size(prog, data_size, "Processing events..."); - data_size += rd->data_offset; mmap_size = MMAP_SIZE; @@ -2006,6 +2004,105 @@ static int __perf_session__process_events(struct perf_session *session) return err; } +static s64 process_index(struct perf_session *session, + union perf_event *event, + u64 file_offset) +{ + struct perf_evlist *evlist = session->evlist; + u64 timestamp; + s64 ret; + + if (session->header.needs_swap) + event_swap(event, perf_evlist__sample_id_all(evlist)); + + if (event->header.type >= PERF_RECORD_HEADER_MAX) + return -EINVAL; + + events_stats__inc(&evlist->stats, event->header.type); + + if (event->header.type >= PERF_RECORD_USER_TYPE_START) + return perf_session__process_user_event(session, event, file_offset); + + ret = perf_evlist__parse_sample_timestamp(evlist, event, ×tamp); + if (ret) + return ret; + + return ordered_events__queue(&session->ordered_events, event, + timestamp, file_offset); +} + +/* + * This function reads, merge and process directory data. + * It assumens the version 1 of directory data, where each + * data file holds per-cpu data, already sorted by kernel. + */ +static int __perf_session__process_dir_events(struct perf_session *session) +{ + struct perf_data *data = session->data; + struct perf_tool *tool = session->tool; + struct reader rd = { + .fd = perf_data__fd(session->data), + .data_size = session->header.data_size, + .data_offset = session->header.data_offset, + .process = process_simple, + }; + int i, ret = 0; + struct ui_progress prog; + u64 total_size = perf_data__size(session->data); + + perf_tool__fill_defaults(tool); + + ui_progress__init_size(&prog, total_size, "Processing events..."); + + /* + * The data are sequentially read into session->ordered_events + * queue, without no flushing during the reading. When all of + * data is merged in, we flush the whole queue. + * + * Note, that we don't store PERF_RECORD_FINISHED_ROUND events + * for directory data, so there are no 'middle' flushes of the + * queue, just the final, when all is in. + * + * Read first data from the header file.. + */ + ret = reader__process_events(&rd, session, &prog); + if (ret) + goto out_err; + + /* ... and continue with data files.. */ + for (i = 0; i < data->dir.nr ; i++) { + struct perf_data_file *file = &data->dir.files[i]; + + if (file->size == 0) + continue; + + rd = (struct reader) { + .fd = file->fd, + .data_size = file->size, + .data_offset = 0, + .process = process_index, + }; + + ret = reader__process_events(&rd, session, &prog); + if (ret) + goto out_err; + } + + /* ... and flush everything out. */ + ret = ordered_events__flush(&session->ordered_events, OE_FLUSH__FINAL); + +out_err: + if (!tool->no_warn) + perf_session__warn_about_errors(session); + + /* + * We may switching perf.data output, make ordered_events + * reusable. + */ + ordered_events__reinit(&session->ordered_events); + return ret; +} + int perf_session__process_events(struct perf_session *session) { if (perf_session__register_idle_thread(session) < 0) @@ -2014,6 +2111,9 @@ int perf_session__process_events(struct perf_session *session) if (perf_data__is_pipe(session->data)) return __perf_session__process_pipe_events(session); + if (perf_data__is_dir(session->data)) + return __perf_session__process_dir_events(session); + return __perf_session__process_events(session); } -- 2.17.2