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 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 1AF78C43381 for ; Fri, 8 Mar 2019 13:48:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0CF7214D8 for ; Fri, 8 Mar 2019 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552052894; bh=7v8eEYOvoW+ftjkG+9fhOQpRRcYHlZLrQ1WAcqL97OI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NBlF91L2m10eJzVxL0XUwo4/SY/hNfLWBQ84Ucyt34iHAOrNCFVyVA/LLhlCef+5e DPrL7E3kPjjjrP5D8vTYh6/WpEOdcBNmf07pvUazqZufE1AezxbEtmtY8+0wYQ72ZH 1axmOKuLpZgdDgMz74GVq9NDeBKNUJsK9q7nNsVc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726893AbfCHNsM (ORCPT ); Fri, 8 Mar 2019 08:48:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49366 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726807AbfCHNsK (ORCPT ); Fri, 8 Mar 2019 08:48:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F5AD2CD819; Fri, 8 Mar 2019 13:48:10 +0000 (UTC) Received: from krava.brq.redhat.com (unknown [10.43.17.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D11E5C1B4; Fri, 8 Mar 2019 13:48:08 +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 08/11] perf session: Add path to reader object Date: Fri, 8 Mar 2019 14:47:42 +0100 Message-Id: <20190308134745.5057-9-jolsa@kernel.org> In-Reply-To: <20190308134745.5057-1-jolsa@kernel.org> References: <20190308134745.5057-1-jolsa@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 08 Mar 2019 13:48:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding path to reader object, so we can display file the processing fails for (string in [] brackets). $ perf report --stdio 0x5e0 [perf.data/data.3] [0xa200]: failed to process type: -1577027574 Link: http://lkml.kernel.org/n/tip-4bjnoy4sln7adqtd3505q29q@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index b55f4281b1da..33f363caaa7c 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1858,6 +1858,7 @@ struct reader { u64 data_size; u64 data_offset; reader_cb_t process; + char *path; }; static int @@ -1872,6 +1873,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, union perf_event *event; s64 skip; + pr_debug("reader processing %s\n", rd->path); + page_offset = page_size * (rd->data_offset / page_size); file_offset = page_offset; head = rd->data_offset - page_offset; @@ -1927,8 +1930,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, if (size < sizeof(struct perf_event_header) || (skip = rd->process(session, event, file_pos)) < 0) { - pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n", - file_offset + head, event->header.size, + pr_err("%#" PRIx64 " [%s] [%#x]: failed to process type: %d\n", + file_offset + head, rd->path, event->header.size, event->header.type); err = -EINVAL; goto out; @@ -1966,6 +1969,7 @@ static int __perf_session__process_events(struct perf_session *session) .data_size = session->header.data_size, .data_offset = session->header.data_offset, .process = process_simple, + .path = session->data->file.path, }; struct ordered_events *oe = &session->ordered_events; struct perf_tool *tool = session->tool; @@ -2040,6 +2044,7 @@ static int __perf_session__process_dir_events(struct perf_session *session) .data_size = session->header.data_size, .data_offset = session->header.data_offset, .process = process_simple, + .path = session->data->file.path, }; int i, ret = 0; struct ui_progress prog; @@ -2066,6 +2071,7 @@ static int __perf_session__process_dir_events(struct perf_session *session) .data_size = file->size, .data_offset = 0, .process = process_index, + .path = file->path, }; ret = reader__process_events(&rd, session, &prog); -- 2.17.2