pm: cpupower: remove hard-coded topology depth values

Remove hard-coded topology depth values and replace them with
defines to improve code readability and maintainability in
cpupower-monitor code.

Link: https://lore.kernel.org/r/20250305225342.19447-3-skhan@linuxfoundation.org
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Shuah Khan 2025-03-05 15:53:40 -07:00
parent d52d2b311a
commit 0014f65e3d

View File

@ -92,7 +92,11 @@ int fill_string_with_spaces(char *s, int n)
return 0;
}
#define MAX_COL_WIDTH 6
#define MAX_COL_WIDTH 6
#define TOPOLOGY_DEPTH_PKG 3
#define TOPOLOGY_DEPTH_CORE 2
#define TOPOLOGY_DEPTH_CPU 1
void print_header(int topology_depth)
{
int unsigned mon;
@ -114,12 +118,19 @@ void print_header(int topology_depth)
}
printf("\n");
if (topology_depth > 2)
switch (topology_depth) {
case TOPOLOGY_DEPTH_PKG:
printf(" PKG|");
if (topology_depth > 1)
break;
case TOPOLOGY_DEPTH_CORE:
printf("CORE|");
if (topology_depth > 0)
break;
case TOPOLOGY_DEPTH_CPU:
printf(" CPU|");
break;
default:
return;
}
for (mon = 0; mon < avail_monitors; mon++) {
if (mon != 0)
@ -153,12 +164,19 @@ void print_results(int topology_depth, int cpu)
cpu_top.core_info[cpu].pkg == -1)
return;
if (topology_depth > 2)
switch (topology_depth) {
case TOPOLOGY_DEPTH_PKG:
printf("%4d|", cpu_top.core_info[cpu].pkg);
if (topology_depth > 1)
break;
case TOPOLOGY_DEPTH_CORE:
printf("%4d|", cpu_top.core_info[cpu].core);
if (topology_depth > 0)
break;
case TOPOLOGY_DEPTH_CPU:
printf("%4d|", cpu_top.core_info[cpu].cpu);
break;
default:
return;
}
for (mon = 0; mon < avail_monitors; mon++) {
if (mon != 0)
@ -454,15 +472,15 @@ int cmd_monitor(int argc, char **argv)
/* ToDo: Topology parsing needs fixing first to do
this more generically */
if (cpu_top.pkgs > 1)
print_header(3);
print_header(TOPOLOGY_DEPTH_PKG);
else
print_header(1);
print_header(TOPOLOGY_DEPTH_CPU);
for (cpu = 0; cpu < cpu_count; cpu++) {
if (cpu_top.pkgs > 1)
print_results(3, cpu);
print_results(TOPOLOGY_DEPTH_PKG, cpu);
else
print_results(1, cpu);
print_results(TOPOLOGY_DEPTH_CPU, cpu);
}
for (num = 0; num < avail_monitors; num++) {