mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
tools/power/x86/intel-speed-select: Fix json perf-profile output output
The 'intel-speed-select -f json perf-profile get-lock-status' command
outputs the package, die, and cpu data as separate fields.
ex)
"package-0": {
"die-0": {
"cpu-0": {
Commit 74062363f8
("tools/power/x86/intel-speed-select: Avoid duplicate Package strings for json") prettied this output so that it is a single line for
some json output commands and the same should be done for other commands.
Output package, die, and cpu info in a single line when using json output.
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
This commit is contained in:
parent
f441d66a6e
commit
aa8b650b1a
1 changed files with 18 additions and 8 deletions
|
@ -316,21 +316,31 @@ void isst_ctdp_display_core_info(int cpu, FILE *outf, char *prefix,
|
||||||
{
|
{
|
||||||
char header[256];
|
char header[256];
|
||||||
char value[256];
|
char value[256];
|
||||||
|
int level = 1;
|
||||||
|
|
||||||
|
if (out_format_is_json()) {
|
||||||
|
snprintf(header, sizeof(header), "package-%d:die-%d:cpu-%d",
|
||||||
|
get_physical_package_id(cpu), get_physical_die_id(cpu),
|
||||||
|
cpu);
|
||||||
|
format_and_print(outf, level++, header, NULL);
|
||||||
|
} else {
|
||||||
|
snprintf(header, sizeof(header), "package-%d",
|
||||||
|
get_physical_package_id(cpu));
|
||||||
|
format_and_print(outf, level++, header, NULL);
|
||||||
|
snprintf(header, sizeof(header), "die-%d",
|
||||||
|
get_physical_die_id(cpu));
|
||||||
|
format_and_print(outf, level++, header, NULL);
|
||||||
|
snprintf(header, sizeof(header), "cpu-%d", cpu);
|
||||||
|
format_and_print(outf, level++, header, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
snprintf(header, sizeof(header), "package-%d",
|
|
||||||
get_physical_package_id(cpu));
|
|
||||||
format_and_print(outf, 1, header, NULL);
|
|
||||||
snprintf(header, sizeof(header), "die-%d", get_physical_die_id(cpu));
|
|
||||||
format_and_print(outf, 2, header, NULL);
|
|
||||||
snprintf(header, sizeof(header), "cpu-%d", cpu);
|
|
||||||
format_and_print(outf, 3, header, NULL);
|
|
||||||
if (str0 && !val)
|
if (str0 && !val)
|
||||||
snprintf(value, sizeof(value), "%s", str0);
|
snprintf(value, sizeof(value), "%s", str0);
|
||||||
else if (str1 && val)
|
else if (str1 && val)
|
||||||
snprintf(value, sizeof(value), "%s", str1);
|
snprintf(value, sizeof(value), "%s", str1);
|
||||||
else
|
else
|
||||||
snprintf(value, sizeof(value), "%u", val);
|
snprintf(value, sizeof(value), "%u", val);
|
||||||
format_and_print(outf, 4, prefix, value);
|
format_and_print(outf, level, prefix, value);
|
||||||
|
|
||||||
format_and_print(outf, 1, NULL, NULL);
|
format_and_print(outf, 1, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue