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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1560C04A68 for ; Thu, 28 Jul 2022 22:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231797AbiG1W3Q (ORCPT ); Thu, 28 Jul 2022 18:29:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232781AbiG1W25 (ORCPT ); Thu, 28 Jul 2022 18:28:57 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4AFC7A520 for ; Thu, 28 Jul 2022 15:28:53 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id j11-20020a170902da8b00b0016d6ceb5701so1875388plx.5 for ; Thu, 28 Jul 2022 15:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=C+isQDTjfYgwoBdi8ZF1+k8jnCvyTTKgCTIA0bNoRsE=; b=rZ/t808b2UAp/pVT4tYGxfTi7iCGP/oyXOCx8jlW88r1aeWuTSeysum/+L/bQ077sw kS8lEciYjUXgC/Ljtz18ghG1lJYYhmcTqIhdTf6oL46WSDQcQ39P//q7VQ+D/wSiKbEy N5ldsPWWMMhjzLPG9C1uydL98QE03DIDZt/tyYnNN4REU7xTJP+JYECAk5kJkXJafezt W0SEG5jK11XAopleSM5Ups0rJwo+n0GzY1g/EDBeJWMliEHqvUl4isep3hKcK+Lrp1At i2I9J0wWbfhCEv4XQv4Yv1cEvqxocV7Od+QI8UYBpyKLq2ZnfORqLkos4J2i/DnKsaOZ 0btA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=C+isQDTjfYgwoBdi8ZF1+k8jnCvyTTKgCTIA0bNoRsE=; b=6KKYvKnrekELFKd9HtdTAOWX+YkwMOmDzlvBxJR/70zD+Za9a3W3UE+dwOW9r7BRCD s+2Q4WLLdYSEP4873HnkZnN7eacpKyY3gRKZRh5mOt4od5LIMLCiDJlweMEl8+J03Xd2 k095UsHavjG2MR+cjXWl5jNbTaVZvAuGYDUUJ4H8AMrLw1hesgfPyA8bAH/wkO0B7+E/ UHwp5H24GhgqbfVQNt8IMXQLgOsTV//ZBU4sYX5bJ8M1Ek367sFbzz70NmJBWsOE9/vU 7umY4weJDy0nCgrc2LzqaqL0zN3ScCW7DAY0TA4mIlBNpTIzzRIfQnm6tAqJcWfjSmqc nhtA== X-Gm-Message-State: ACgBeo3RTBLjNvgoPVHOxKxEJco38ixNC1ZIvyp23MTx+iVWWRxcubQ7 a8a9cQsB1nDZgkDjgm0sCn7cL4YEC5hP X-Google-Smtp-Source: AA6agR6UiT7KBmhevKE2QVNBEvxGz11GM1uIdmF0gIoZZatsNkzcDpY4c2jHUQlh5S59qr+9zsF2ChGDAeYi X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:fd09:96c3:28af:b08f]) (user=irogers job=sendgmr) by 2002:a17:90b:10e:b0:1f1:f3b0:9304 with SMTP id p14-20020a17090b010e00b001f1f3b09304mr55590pjz.1.1659047332452; Thu, 28 Jul 2022 15:28:52 -0700 (PDT) Date: Thu, 28 Jul 2022 15:28:24 -0700 In-Reply-To: <20220728222835.3254224-1-irogers@google.com> Message-Id: <20220728222835.3254224-6-irogers@google.com> Mime-Version: 1.0 References: <20220728222835.3254224-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.455.g008518b4e5-goog Subject: [PATCH v2 05/16] perf jevents: Provide path to json file on error From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andi Kleen , Zhengjun Xing , Ravi Bangoria , Kan Liang , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If a JSONDecoderError or similar is raised then it is useful to know the path. Print this and then raise the exception agan. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index c53c744da56b..7d5110327468 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -225,7 +225,12 @@ class JsonEvent: def read_json_events(path: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" - return json.load(open(path), object_hook=lambda d: JsonEvent(d)) + + try: + return json.load(open(path), object_hook=lambda d: JsonEvent(d)) + except BaseException as err: + print(f"Exception processing {path}") + raise def preprocess_arch_std_files(archpath: str) -> None: -- 2.37.1.455.g008518b4e5-goog 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD41CC04A68 for ; Thu, 28 Jul 2022 22:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9oGl/hx1walZoWyM/HZ4VkAwlHXPZE7v/IumGGweaz0=; b=o9GqpD3MXNR35yD0iIDOcmXB6U 5Ib876CdTcOjbGa1Ld6U8yBG6HWnkSp7cHcugi6I0zDtYtL0Thry3hlR+9nvcmHnvXH+wR/nYZbcC FMVpM48jkfn4rG5majO5rP0JUGn/8OkeuXyHVqD7R7B/hi9Idhp3YgAoK1crIS1qHKDxgT91jNsuo ePP8TZRjHCoNZ+5YXuYlsMDD9hTjNj6bbfQrItZIBarzR1UOkGmsd7y6J5RnTpeK5FXI66lOccqQF xr8wdvk8MZOzreSPkk7AwyXUSglOLbbw4l63Dk+WBqEJPQ3rd/cvcIaeCpOOY+i5tU0ngWzKCQGZV Id6hlkiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHC13-00FYEO-7e; Thu, 28 Jul 2022 22:30:02 +0000 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHBzz-00FXo1-FM for linux-arm-kernel@lists.infradead.org; Thu, 28 Jul 2022 22:28:56 +0000 Received: by mail-pg1-x549.google.com with SMTP id u64-20020a638543000000b00412b09eae15so1472632pgd.15 for ; Thu, 28 Jul 2022 15:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=C+isQDTjfYgwoBdi8ZF1+k8jnCvyTTKgCTIA0bNoRsE=; b=rZ/t808b2UAp/pVT4tYGxfTi7iCGP/oyXOCx8jlW88r1aeWuTSeysum/+L/bQ077sw kS8lEciYjUXgC/Ljtz18ghG1lJYYhmcTqIhdTf6oL46WSDQcQ39P//q7VQ+D/wSiKbEy N5ldsPWWMMhjzLPG9C1uydL98QE03DIDZt/tyYnNN4REU7xTJP+JYECAk5kJkXJafezt W0SEG5jK11XAopleSM5Ups0rJwo+n0GzY1g/EDBeJWMliEHqvUl4isep3hKcK+Lrp1At i2I9J0wWbfhCEv4XQv4Yv1cEvqxocV7Od+QI8UYBpyKLq2ZnfORqLkos4J2i/DnKsaOZ 0btA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=C+isQDTjfYgwoBdi8ZF1+k8jnCvyTTKgCTIA0bNoRsE=; b=PLFiDQneHYnUV+xjQugjTVEvYmAsG2Wh9vpVzvHrr8HTK/f5TuigxpE25/L9vUFyPG ZTEEh4UkZG0EF2bQMdiCq6OxC+Uiw73BaUV+VTp7jYZ8APgozzLZ6ns6gMw7NTfAbQC8 xGQqDqypM1RIsb/X3k5d01HI2b4KGkfPQzyuoVp8wOxC+TQ3XVga7PnN0aN78YS//Lq0 wT9dz4qKij8CK/9luCWiyOZQVeJos46SrNK/oPkGJklRfoqgdXQMnhDQsXc9Qas2T43Y l1cF38mpiknVbEIUnMEAooQNlx4FLjO5gdxzHmx1KMi/3AaFU/1URwbHdNveRq6/2t89 9ciA== X-Gm-Message-State: ACgBeo0qL/Rxz1vunEJDiBYddUKoCFLTxaVIz6MDOLspGguVtccAYcku xoR7Fw5d6u2OhxhqMjo7xIabZgcJfgjG X-Google-Smtp-Source: AA6agR6UiT7KBmhevKE2QVNBEvxGz11GM1uIdmF0gIoZZatsNkzcDpY4c2jHUQlh5S59qr+9zsF2ChGDAeYi X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:fd09:96c3:28af:b08f]) (user=irogers job=sendgmr) by 2002:a17:90b:10e:b0:1f1:f3b0:9304 with SMTP id p14-20020a17090b010e00b001f1f3b09304mr55590pjz.1.1659047332452; Thu, 28 Jul 2022 15:28:52 -0700 (PDT) Date: Thu, 28 Jul 2022 15:28:24 -0700 In-Reply-To: <20220728222835.3254224-1-irogers@google.com> Message-Id: <20220728222835.3254224-6-irogers@google.com> Mime-Version: 1.0 References: <20220728222835.3254224-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.455.g008518b4e5-goog Subject: [PATCH v2 05/16] perf jevents: Provide path to json file on error From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andi Kleen , Zhengjun Xing , Ravi Bangoria , Kan Liang , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220728_152855_536464_163D8D59 X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If a JSONDecoderError or similar is raised then it is useful to know the path. Print this and then raise the exception agan. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index c53c744da56b..7d5110327468 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -225,7 +225,12 @@ class JsonEvent: def read_json_events(path: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" - return json.load(open(path), object_hook=lambda d: JsonEvent(d)) + + try: + return json.load(open(path), object_hook=lambda d: JsonEvent(d)) + except BaseException as err: + print(f"Exception processing {path}") + raise def preprocess_arch_std_files(archpath: str) -> None: -- 2.37.1.455.g008518b4e5-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel