summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2022-08-12 16:09:38 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2022-08-13 14:59:26 -0300
commitee2ce6fdc8021979346f71056938c60335a7570c (patch)
tree12288a5ecb8cbf0080258145772fa9b8d786ab81
parentf793ae185e27645ad83942ef6fffd901b8169941 (diff)
downloadlwn-ee2ce6fdc8021979346f71056938c60335a7570c.tar.gz
lwn-ee2ce6fdc8021979346f71056938c60335a7570c.zip
perf jevents: Provide path to JSON file on error
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> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.garry@huawei.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Stephane Eranian <eranian@google.com> Cc: Will Deacon <will@kernel.org> Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com> Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20220812230949.683239-4-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rwxr-xr-xtools/perf/pmu-events/jevents.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
index 8e8462cb359b..31936eafa9ff 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: