Skip to content

Commit 5dc241f

Browse files
committed
tools/power turbostat: tweak --show and --hide capability
allow invocations such as # turbostat --show power,Busy% previously the "Busy%" was ignored Signed-off-by: Len Brown <len.brown@intel.com>
1 parent f443e37 commit 5dc241f

1 file changed

Lines changed: 20 additions & 15 deletions

File tree

tools/power/x86/turbostat/turbostat.c

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -752,26 +752,31 @@ unsigned long long bic_lookup(char *name_list, enum show_hide_mode mode)
752752
if (comma)
753753
*comma = '\0';
754754

755-
if (!strcmp(name_list, "all"))
756-
return ~0;
757-
if (!strcmp(name_list, "topology"))
758-
return BIC_TOPOLOGY;
759-
if (!strcmp(name_list, "power"))
760-
return BIC_THERMAL_PWR;
761-
if (!strcmp(name_list, "idle"))
762-
return BIC_IDLE;
763-
if (!strcmp(name_list, "frequency"))
764-
return BIC_FREQUENCY;
765-
if (!strcmp(name_list, "other"))
766-
return BIC_OTHER;
767-
if (!strcmp(name_list, "all"))
768-
return 0;
769-
770755
for (i = 0; i < MAX_BIC; ++i) {
771756
if (!strcmp(name_list, bic[i].name)) {
772757
retval |= (1ULL << i);
773758
break;
774759
}
760+
if (!strcmp(name_list, "all")) {
761+
retval |= ~0;
762+
break;
763+
} else if (!strcmp(name_list, "topology")) {
764+
retval |= BIC_TOPOLOGY;
765+
break;
766+
} else if (!strcmp(name_list, "power")) {
767+
retval |= BIC_THERMAL_PWR;
768+
break;
769+
} else if (!strcmp(name_list, "idle")) {
770+
retval |= BIC_IDLE;
771+
break;
772+
} else if (!strcmp(name_list, "frequency")) {
773+
retval |= BIC_FREQUENCY;
774+
break;
775+
} else if (!strcmp(name_list, "other")) {
776+
retval |= BIC_OTHER;
777+
break;
778+
}
779+
775780
}
776781
if (i == MAX_BIC) {
777782
if (mode == SHOW_LIST) {

0 commit comments

Comments
 (0)