mirror of https://github.com/torvalds/linux.git
967364894e
Now that printing metric-value and metric-unit is optional,
print_running_json() shouldn't add the comma in case it becomes
trailing.
Replace all manual JSON comma stuff with a json_out() function that uses
the existing os->first tracking and auto inserts a comma if it's needed.
Update the test to handle that two of the fields can be missing.
This fixes the following test failure on Cortex A57 where the branch
misses metric is missing a required event:
$ perf test -vvv "json output"
106: perf stat JSON output linter:
--- start ---
test child forked, pid 665682
Checking json output: no args Test failed for input:
{"counter-value" : "3112.000000", "unit" : "",
"event" : "armv8_pmuv3_1/branch-misses/",
"event-runtime" : 20699340, "pcnt-running" : 100.00, }
...
json.decoder.JSONDecodeError: Expecting property name enclosed in
double quotes: line 12 column 144 (char 2109)
---- end(-1) ----
106: perf stat JSON output linter : FAILED!
Fixes:
|
||
|---|---|---|
| .. | ||
| attr.py | ||
| coresight.sh | ||
| perf_has_symbol.sh | ||
| perf_json_output_lint.py | ||
| perf_metric_validation.py | ||
| perf_metric_validation_rules.json | ||
| probe.sh | ||
| probe_vfs_getname.sh | ||
| setup_python.sh | ||
| stat_output.sh | ||
| waiting.sh | ||