Message ID | 20220715063653.3203761-6-irogers@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> 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 99405C43334 for <linux-arm-kernel@archiver.kernel.org>; Fri, 15 Jul 2022 06:40:07 +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=12DoLOjv/d9sPMOWxXZiiR6DiiWtcgLCV6KECE+Iodg=; b=z9jtqMi+pbXUP0POduGMKw0iq0 RU0SQJm5kPJLVK/XGzABkcek+tFxJ3zpll7PGDY5OZP4wIzHh55StZSmOj04uaGxg17yVqkifdIjM OMb8irQnBgaEBvUqHLFIR3O1pHfd3yDboycalYjgijcAbE0FwhDL+owBrcC2h221oPycmyX3eTzll ET8JtUiIZokDQ66U/j1zJdKD7zvgJxaAFwkyvKKhJgy/YUtzBtfZa5X+zSEn21Yn6ptKaf1MdwXV9 rWfPB3Q51u1s9iaKawNGrDjzMpLa4toFXIjtMYDyaH4i8+ZQULENUOvwGF2KVQQXww9S5EuGrLLYe 7JlHw3aw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCEyY-004eaa-Bc; Fri, 15 Jul 2022 06:38:58 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCEx5-004e0f-Vh for linux-arm-kernel@lists.infradead.org; Fri, 15 Jul 2022 06:37:30 +0000 Received: by mail-yb1-xb49.google.com with SMTP id y4-20020a25b9c4000000b0066e573fb0fcso3342554ybj.21 for <linux-arm-kernel@lists.infradead.org>; Thu, 14 Jul 2022 23:37:27 -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=oNv4/zk1+mjyJIqC7KPNbf+jkGA2kI+7rQYeIFSNhZY=; b=Mpd1GjFJ9InS1ooJdyFxyNnJqwScVucDO7ehk16fZYUtOO6hqoqzN/DHXWInmUD1aK mGDqogxpxrmTlutbkwRfyGYoCIqUOhhUz4hcw7CiMRDBTFtBxiWaHp4ijjCHfRVC/TrX UDTPrUhfylNHbSepVnUZomdkuvy9HCqKGoQ/bSrQFnwdMCBtyzVEnMflByoNccWF+GsR CdVmGrTWaPVZI/PuSu/ng6tcVX9SZGx1vzDsJGLnbXuzwEgDYfGPchfz2Aqgn8GDdBX/ Qoni9TFh7w4lyPt0QnNdmI63icwlKFgpnAwTY7NYfEJc2gL7Ghe7dZh8+q0v18IVoG64 3Kww== 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=oNv4/zk1+mjyJIqC7KPNbf+jkGA2kI+7rQYeIFSNhZY=; b=lfKJ6MPLYl8VB6KTUPiJtfF2xfc6E2qIdJyKjf1QyuLlkWRT05AFs+SPMvda4AgBV4 pNRoO08QxpCVhjFP6dfhwzwp86uME3fgts+QhH/3i9jmvUlyGt+CTGXu0VFn1E6YoM07 uR+Ag4GZ14CF0sGDSNaN+/MuGuSFKRzKmijH8uSYqGaQjkiZSmekdF3TGUf9yMClNy0G vp3rqcrlipChq7d/BIdXx6Zeb//hTV2BAvHEReTt3u8EqM+Ti6PCabgEkC/ETEV0q0mm VrWXUzqyQc4P+sNPOnz/d+a1PvtmEgZK4wHAt/ukHUFjA3MgdECnX9TCzvQGrWSPOMMU VIFQ== X-Gm-Message-State: AJIora+lYNIkEgJDoQLjvR+gvufMin2HSCilkaxBbccJXRjjlxIS5lvN xXtLj5P2VUNrsNvBDXqPSmkphb3IuGFz X-Google-Smtp-Source: AGRyM1t7KCgLWCt2hEcOCq4fDH+oYV3WDSVG9zEdbtZELrdsky27kk4fzOhKyzwMgRxo9S+WlVPNS4PjAqu7 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:e8fe:2a8e:e0f6:318d]) (user=irogers job=sendgmr) by 2002:a0d:e60d:0:b0:31c:8046:8ff with SMTP id p13-20020a0de60d000000b0031c804608ffmr14288131ywe.412.1657867046502; Thu, 14 Jul 2022 23:37:26 -0700 (PDT) Date: Thu, 14 Jul 2022 23:36:43 -0700 In-Reply-To: <20220715063653.3203761-1-irogers@google.com> Message-Id: <20220715063653.3203761-6-irogers@google.com> Mime-Version: 1.0 References: <20220715063653.3203761-1-irogers@google.com> X-Mailer: git-send-email 2.37.0.170.g444d1eabd0-goog Subject: [PATCH v1 05/15] perf jevents: Provide path to json file on error From: Ian Rogers <irogers@google.com> To: John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, James Clark <james.clark@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Andi Kleen <ak@linux.intel.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Kan Liang <kan.liang@linux.intel.com>, Adrian Hunter <adrian.hunter@intel.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220714_233728_076362_EE1ECCA5 X-CRM114-Status: GOOD ( 12.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
Compress the pmu_event tables
|
expand
|
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:
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 <irogers@google.com> --- tools/perf/pmu-events/jevents.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)