Skip to content

Commit b263200

Browse files
cyringcyring
committed
Code review: various UI strings moved to the Resource table
1 parent 8204ff9 commit b263200

File tree

5 files changed

+393
-164
lines changed

5 files changed

+393
-164
lines changed

‎corefreq-cli-rsc-en.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,8 @@
511511
#define RSC_COUNTERS_CODE_EN "Counters"
512512
#define RSC_GENERAL_CTRS_CODE_EN "General"
513513
#define RSC_FIXED_CTRS_CODE_EN "Fixed"
514+
#define RSC_PERF_MON_UNIT_BIT_CODE_EN "bits"
515+
#define RSC_PERF_MON_UNIT_HWP_CODE_EN "(MHz)"
514516
#define RSC_PERF_MON_C1E_CODE_EN "Enhanced Halt State"
515517
#define RSC_PERF_MON_C1A_CODE_EN "C1 Auto Demotion"
516518
#define RSC_PERF_MON_C3A_CODE_EN "C3 Auto Demotion"

‎corefreq-cli-rsc-fr.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,8 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
370370
#define RSC_COUNTERS_CODE_FR "Compteurs"
371371
#define RSC_GENERAL_CTRS_CODE_FR "G""\xa9""n""\xa9""raux"
372372
#define RSC_FIXED_CTRS_CODE_FR "Fixes"
373+
#define RSC_PERF_MON_UNIT_BIT_CODE_FR "bits"
374+
#define RSC_PERF_MON_UNIT_HWP_CODE_FR "(MHz)"
373375
#define RSC_PERF_MON_C1E_CODE_FR "Enhanced Halt State"
374376
#define RSC_PERF_MON_C1A_CODE_FR "C1 Auto Demotion"
375377
#define RSC_PERF_MON_C3A_CODE_FR "C3 Auto Demotion"

‎corefreq-cli-rsc.c‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,8 +1090,19 @@ RESOURCE_ST Resource[] = {
10901090
RSC_RECORDER_CODE_FR),
10911091
[RSC_STRESS] = LDT( RSC_STRESS_CODE_EN,
10921092
RSC_STRESS_CODE_FR),
1093+
[RSC_FREQ_UNIT_MHZ] = LDQ( RSC_FREQ_UNIT_MHZ_CODE),
1094+
[RSC_PPIN] = LDQ( RSC_PPIN_CODE),
1095+
[RSC_PSTATE] = LDQ( RSC_PSTATE_CODE),
1096+
[RSC_UNCORE] = LDQ( RSC_UNCORE_CODE),
1097+
[RSC_BOOST] = LDQ( RSC_BOOST_CODE),
1098+
[RSC_TURBO] = LDQ( RSC_TURBO_CODE),
10931099
[RSC_MAX] = LDQ( RSC_MAX_CODE),
10941100
[RSC_MIN] = LDQ( RSC_MIN_CODE),
1101+
[RSC_TGT] = LDQ( RSC_TGT_CODE),
1102+
[RSC_HWP] = LDQ( RSC_HWP_CODE),
1103+
[RSC_XFR] = LDQ( RSC_XFR_CODE),
1104+
[RSC_CPB] = LDQ( RSC_CPB_CODE),
1105+
[RSC_TDP] = LDQ( RSC_TDP_CODE),
10951106
[RSC_ACT] = LDQ( RSC_ACT_CODE),
10961107
[RSC_SCOPE_NONE] = LDT( RSC_SCOPE_NONE_CODE_EN,
10971108
RSC_SCOPE_NONE_CODE_FR),
@@ -1456,6 +1467,8 @@ RESOURCE_ST Resource[] = {
14561467
RSC_VARIANT_CODE_FR),
14571468
[RSC_INVARIANT] = LDT( RSC_INVARIANT_CODE_EN,
14581469
RSC_INVARIANT_CODE_FR),
1470+
[RSC_XAPIC] = LDQ( RSC_XAPIC_CODE),
1471+
[RSC_X2APIC] = LDQ( RSC_X2APIC_CODE),
14591472
[RSC_FEATURES_1GB_PAGES]= LDT( RSC_FEATURES_1GB_PAGES_CODE_EN,
14601473
RSC_FEATURES_1GB_PAGES_CODE_FR),
14611474
[RSC_FEATURES_100MHZ] = LDT( RSC_FEATURES_100MHZ_CODE_EN,
@@ -1596,6 +1609,14 @@ RESOURCE_ST Resource[] = {
15961609
RSC_TECHNOLOGIES_R2H_CODE_FR),
15971610
[RSC_TECHNOLOGIES_HYPERV]=LDT( RSC_TECHNOLOGIES_HYPERV_CODE_EN,
15981611
RSC_TECHNOLOGIES_HYPERV_CODE_FR),
1612+
[RSC_TECH_HYPERV_NONE] = LDQ( RSC_TECH_HYPERV_NONE_CODE),
1613+
[RSC_TECH_BARE_METAL] = LDQ( RSC_TECH_BARE_METAL_CODE),
1614+
[RSC_TECH_HYPERV_XEN] = LDQ( RSC_TECH_HYPERV_XEN_CODE),
1615+
[RSC_TECH_HYPERV_KVM] = LDQ( RSC_TECH_HYPERV_KVM_CODE),
1616+
[RSC_TECH_HYPERV_VBOX] = LDQ( RSC_TECH_HYPERV_VBOX_CODE),
1617+
[RSC_TECH_HYPERV_KBOX] = LDQ( RSC_TECH_HYPERV_KBOX_CODE),
1618+
[RSC_TECH_HYPERV_VMWARE]= LDQ( RSC_TECH_HYPERV_VMWARE_CODE),
1619+
[RSC_TECH_HYPERV_HYPERV]= LDQ( RSC_TECH_HYPERV_HYPERV_CODE),
15991620
[RSC_PERF_MON_TITLE] = LDT( RSC_PERF_MON_TITLE_CODE_EN,
16001621
RSC_PERF_MON_TITLE_CODE_FR),
16011622
[RSC_VERSION] = LDT( RSC_VERSION_CODE_EN,
@@ -1606,6 +1627,10 @@ RESOURCE_ST Resource[] = {
16061627
RSC_GENERAL_CTRS_CODE_FR),
16071628
[RSC_FIXED_CTRS] = LDT( RSC_FIXED_CTRS_CODE_EN,
16081629
RSC_FIXED_CTRS_CODE_FR),
1630+
[RSC_PERF_MON_UNIT_BIT] = LDT( RSC_PERF_MON_UNIT_BIT_CODE_EN,
1631+
RSC_PERF_MON_UNIT_BIT_CODE_FR),
1632+
[RSC_PERF_MON_UNIT_HWP] = LDT( RSC_PERF_MON_UNIT_HWP_CODE_EN,
1633+
RSC_PERF_MON_UNIT_HWP_CODE_FR),
16091634
[RSC_PERF_MON_C1E] = LDT( RSC_PERF_MON_C1E_CODE_EN,
16101635
RSC_PERF_MON_C1E_CODE_FR),
16111636
[RSC_PERF_MON_C1A] = LDT( RSC_PERF_MON_C1A_CODE_EN,
@@ -1676,6 +1701,40 @@ RESOURCE_ST Resource[] = {
16761701
RSC_PERF_MON_NB_DF_CODE_FR),
16771702
[RSC_PERF_MON_CORE] = LDT( RSC_PERF_MON_CORE_CODE_EN,
16781703
RSC_PERF_MON_CORE_CODE_FR),
1704+
[RSC_PERF_LABEL_VER] = LDQ( RSC_PERF_LABEL_VER_CODE),
1705+
[RSC_PERF_LABEL_C1E] = LDQ( RSC_PERF_LABEL_C1E_CODE),
1706+
[RSC_PERF_LABEL_C1A] = LDQ( RSC_PERF_LABEL_C1A_CODE),
1707+
[RSC_PERF_LABEL_C3A] = LDQ( RSC_PERF_LABEL_C3A_CODE),
1708+
[RSC_PERF_LABEL_C1U] = LDQ( RSC_PERF_LABEL_C1U_CODE),
1709+
[RSC_PERF_LABEL_C2U] = LDQ( RSC_PERF_LABEL_C2U_CODE),
1710+
[RSC_PERF_LABEL_C3U] = LDQ( RSC_PERF_LABEL_C3U_CODE),
1711+
[RSC_PERF_LABEL_CC6] = LDQ( RSC_PERF_LABEL_CC6_CODE),
1712+
[RSC_PERF_LABEL_PC6] = LDQ( RSC_PERF_LABEL_PC6_CODE),
1713+
[RSC_PERF_LABEL_MC6] = LDQ( RSC_PERF_LABEL_MC6_CODE),
1714+
[RSC_PERF_LABEL_FID] = LDQ( RSC_PERF_LABEL_FID_CODE),
1715+
[RSC_PERF_LABEL_VID] = LDQ( RSC_PERF_LABEL_VID_CODE),
1716+
[RSC_PERF_LABEL_HWCF] = LDQ( RSC_PERF_LABEL_HWCF_CODE),
1717+
[RSC_PERF_LABEL_HWP] = LDQ( RSC_PERF_LABEL_HWP_CODE),
1718+
[RSC_PERF_LABEL_HDC] = LDQ( RSC_PERF_LABEL_HDC_CODE),
1719+
[RSC_PERF_LABEL_CFG_CTRL]=LDQ( RSC_PERF_LABEL_CFG_CTRL_CODE),
1720+
[RSC_PERF_LABEL_LOW_CST]= LDQ( RSC_PERF_LABEL_LOW_CST_CODE),
1721+
[RSC_PERF_LABEL_IOMWAIT]= LDQ( RSC_PERF_LABEL_IOMWAIT_CODE),
1722+
[RSC_PERF_LABEL_MAX_CST]= LDQ( RSC_PERF_LABEL_MAX_CST_CODE),
1723+
[RSC_PERF_LABEL_CST_BAR]= LDQ( RSC_PERF_LABEL_CST_BAR_CODE),
1724+
[RSC_PERF_LABEL_MWAIT_IDX]=LDQ( RSC_PERF_LABEL_MWAIT_IDX_CODE),
1725+
[RSC_PERF_ENCODING_C0] = LDQ( RSC_PERF_ENCODING_C0_CODE),
1726+
[RSC_PERF_ENCODING_C1] = LDQ( RSC_PERF_ENCODING_C1_CODE),
1727+
[RSC_PERF_ENCODING_C2] = LDQ( RSC_PERF_ENCODING_C2_CODE),
1728+
[RSC_PERF_ENCODING_C3] = LDQ( RSC_PERF_ENCODING_C3_CODE),
1729+
[RSC_PERF_ENCODING_C4] = LDQ( RSC_PERF_ENCODING_C4_CODE),
1730+
[RSC_PERF_ENCODING_C6] = LDQ( RSC_PERF_ENCODING_C6_CODE),
1731+
[RSC_PERF_ENCODING_C6R] = LDQ( RSC_PERF_ENCODING_C6R_CODE),
1732+
[RSC_PERF_ENCODING_C7] = LDQ( RSC_PERF_ENCODING_C7_CODE),
1733+
[RSC_PERF_ENCODING_C7S] = LDQ( RSC_PERF_ENCODING_C7S_CODE),
1734+
[RSC_PERF_ENCODING_C8] = LDQ( RSC_PERF_ENCODING_C8_CODE),
1735+
[RSC_PERF_ENCODING_C9] = LDQ( RSC_PERF_ENCODING_C9_CODE),
1736+
[RSC_PERF_ENCODING_C10] = LDQ( RSC_PERF_ENCODING_C10_CODE),
1737+
[RSC_PERF_ENCODING_UNS] = LDQ( RSC_PERF_ENCODING_UNS_CODE),
16791738
[RSC_POWER_THERMAL_TITLE]=LDT( RSC_POWER_THERMAL_TITLE_CODE_EN,
16801739
RSC_POWER_THERMAL_TITLE_CODE_FR),
16811740
[RSC_POWER_THERMAL_ODCM]=LDT( RSC_POWER_THERMAL_ODCM_CODE_EN,

‎corefreq-cli-rsc.h‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,19 @@ enum {
210210
RSC_HIGHEST,
211211
RSC_RECORDER,
212212
RSC_STRESS,
213+
RSC_FREQ_UNIT_MHZ,
214+
RSC_PPIN,
215+
RSC_PSTATE,
216+
RSC_UNCORE,
217+
RSC_BOOST,
218+
RSC_TURBO,
213219
RSC_MAX,
214220
RSC_MIN,
221+
RSC_TGT,
222+
RSC_HWP,
223+
RSC_XFR,
224+
RSC_CPB,
225+
RSC_TDP,
215226
RSC_ACT,
216227
RSC_SCOPE_NONE,
217228
RSC_SCOPE_THREAD,
@@ -457,6 +468,8 @@ enum {
457468
RSC_PRESENT,
458469
RSC_VARIANT,
459470
RSC_INVARIANT,
471+
RSC_XAPIC,
472+
RSC_X2APIC,
460473
RSC_FEATURES_1GB_PAGES,
461474
RSC_FEATURES_100MHZ,
462475
RSC_FEATURES_ACPI,
@@ -527,11 +540,21 @@ enum {
527540
RSC_TECHNOLOGIES_CPB,
528541
RSC_TECHNOLOGIES_R2H,
529542
RSC_TECHNOLOGIES_HYPERV,
543+
RSC_TECH_HYPERV_NONE,
544+
RSC_TECH_BARE_METAL,
545+
RSC_TECH_HYPERV_XEN,
546+
RSC_TECH_HYPERV_KVM,
547+
RSC_TECH_HYPERV_VBOX,
548+
RSC_TECH_HYPERV_KBOX,
549+
RSC_TECH_HYPERV_VMWARE,
550+
RSC_TECH_HYPERV_HYPERV,
530551
RSC_PERF_MON_TITLE,
531552
RSC_VERSION,
532553
RSC_COUNTERS,
533554
RSC_GENERAL_CTRS,
534555
RSC_FIXED_CTRS,
556+
RSC_PERF_MON_UNIT_BIT,
557+
RSC_PERF_MON_UNIT_HWP,
535558
RSC_PERF_MON_C1E,
536559
RSC_PERF_MON_C1A,
537560
RSC_PERF_MON_C3A,
@@ -567,6 +590,40 @@ enum {
567590
RSC_PERF_MON_TSC,
568591
RSC_PERF_MON_NB_DF,
569592
RSC_PERF_MON_CORE,
593+
RSC_PERF_LABEL_VER,
594+
RSC_PERF_LABEL_C1E,
595+
RSC_PERF_LABEL_C1A,
596+
RSC_PERF_LABEL_C3A,
597+
RSC_PERF_LABEL_C1U,
598+
RSC_PERF_LABEL_C2U,
599+
RSC_PERF_LABEL_C3U,
600+
RSC_PERF_LABEL_CC6,
601+
RSC_PERF_LABEL_PC6,
602+
RSC_PERF_LABEL_MC6,
603+
RSC_PERF_LABEL_FID,
604+
RSC_PERF_LABEL_VID,
605+
RSC_PERF_LABEL_HWCF,
606+
RSC_PERF_LABEL_HWP,
607+
RSC_PERF_LABEL_HDC,
608+
RSC_PERF_LABEL_CFG_CTRL,
609+
RSC_PERF_LABEL_LOW_CST,
610+
RSC_PERF_LABEL_IOMWAIT,
611+
RSC_PERF_LABEL_MAX_CST,
612+
RSC_PERF_LABEL_CST_BAR,
613+
RSC_PERF_LABEL_MWAIT_IDX,
614+
RSC_PERF_ENCODING_C0,
615+
RSC_PERF_ENCODING_C1,
616+
RSC_PERF_ENCODING_C2,
617+
RSC_PERF_ENCODING_C3,
618+
RSC_PERF_ENCODING_C4,
619+
RSC_PERF_ENCODING_C6,
620+
RSC_PERF_ENCODING_C6R,
621+
RSC_PERF_ENCODING_C7,
622+
RSC_PERF_ENCODING_C7S,
623+
RSC_PERF_ENCODING_C8,
624+
RSC_PERF_ENCODING_C9,
625+
RSC_PERF_ENCODING_C10,
626+
RSC_PERF_ENCODING_UNS,
570627
RSC_POWER_THERMAL_TITLE,
571628
RSC_POWER_THERMAL_ODCM,
572629
RSC_POWER_THERMAL_DUTY,
@@ -3055,9 +3112,22 @@ extern RESOURCE_ST Resource[];
30553112
HBK,HBK,HBK,HBK,HBK,HBK,HBK,HBK,HBK \
30563113
}
30573114

3115+
#define RSC_FREQ_UNIT_MHZ_CODE "(MHz)"
3116+
#define RSC_PPIN_CODE "PPIN#"
3117+
#define RSC_PSTATE_CODE "P-State"
3118+
#define RSC_UNCORE_CODE "Uncore"
3119+
#define RSC_BOOST_CODE "Turbo Boost"
3120+
#define RSC_TURBO_CODE "Turbo"
30583121
#define RSC_MAX_CODE "Max"
30593122
#define RSC_MIN_CODE "Min"
3123+
#define RSC_TGT_CODE "TGT"
3124+
#define RSC_HWP_CODE "HWP"
3125+
#define RSC_XFR_CODE "XFR"
3126+
#define RSC_CPB_CODE "CPB"
3127+
#define RSC_TDP_CODE "TDP"
30603128
#define RSC_ACT_CODE "Activ"
3129+
#define RSC_XAPIC_CODE " xAPIC"
3130+
#define RSC_X2APIC_CODE " x2APIC"
30613131

30623132
#define RSC_TOPOLOGY_HDR_PKG_CODE "CPU Pkg Apic"
30633133
#define RSC_TOPOLOGY_HDR_SMT_CODE " Core/Thread"
@@ -3074,6 +3144,52 @@ extern RESOURCE_ST Resource[];
30743144
#define RSC_TOPOLOGY_ALT_ITEM2_CODE " CMP ID ID"
30753145
#define RSC_TOPOLOGY_ALT_ITEM3_CODE "CCD CCX ID/ID"
30763146

3147+
#define RSC_TECH_HYPERV_NONE_CODE " "
3148+
#define RSC_TECH_BARE_METAL_CODE "Bare-Metal"
3149+
#define RSC_TECH_HYPERV_XEN_CODE " Xen"
3150+
#define RSC_TECH_HYPERV_KVM_CODE " KVM"
3151+
#define RSC_TECH_HYPERV_VBOX_CODE "VirtualBox"
3152+
#define RSC_TECH_HYPERV_KBOX_CODE " KVM/VBox"
3153+
#define RSC_TECH_HYPERV_VMWARE_CODE " VMware"
3154+
#define RSC_TECH_HYPERV_HYPERV_CODE "MS Hyper-V"
3155+
3156+
#define RSC_PERF_LABEL_VER_CODE "PM"
3157+
#define RSC_PERF_LABEL_C1E_CODE "C1E"
3158+
#define RSC_PERF_LABEL_C1A_CODE "C1A"
3159+
#define RSC_PERF_LABEL_C3A_CODE "C3A"
3160+
#define RSC_PERF_LABEL_C1U_CODE "C1U"
3161+
#define RSC_PERF_LABEL_C2U_CODE "C2U"
3162+
#define RSC_PERF_LABEL_C3U_CODE "C3U"
3163+
#define RSC_PERF_LABEL_CC6_CODE "CC6"
3164+
#define RSC_PERF_LABEL_PC6_CODE "PC6"
3165+
#define RSC_PERF_LABEL_MC6_CODE "MC6"
3166+
#define RSC_PERF_LABEL_FID_CODE "FID"
3167+
#define RSC_PERF_LABEL_VID_CODE "VID"
3168+
#define RSC_PERF_LABEL_HWCF_CODE "MPERF/APERF"
3169+
#define RSC_PERF_LABEL_HWP_CODE "HWP"
3170+
#define RSC_PERF_LABEL_HDC_CODE "HDC"
3171+
#define RSC_PERF_LABEL_CFG_CTRL_CODE "CONFIG"
3172+
#define RSC_PERF_LABEL_LOW_CST_CODE "LIMIT"
3173+
#define RSC_PERF_LABEL_IOMWAIT_CODE "IOMWAIT"
3174+
#define RSC_PERF_LABEL_MAX_CST_CODE "RANGE"
3175+
#define RSC_PERF_LABEL_CST_BAR_CODE "BAR"
3176+
#define RSC_PERF_LABEL_MWAIT_IDX_CODE \
3177+
"#0 #1 #2 #3 #4 #5 #6 #7"
3178+
3179+
#define RSC_PERF_ENCODING_C0_CODE " C0"
3180+
#define RSC_PERF_ENCODING_C1_CODE " C1"
3181+
#define RSC_PERF_ENCODING_C2_CODE " C2"
3182+
#define RSC_PERF_ENCODING_C3_CODE " C3"
3183+
#define RSC_PERF_ENCODING_C4_CODE " C4"
3184+
#define RSC_PERF_ENCODING_C6_CODE " C6"
3185+
#define RSC_PERF_ENCODING_C6R_CODE "C6R"
3186+
#define RSC_PERF_ENCODING_C7_CODE " C7"
3187+
#define RSC_PERF_ENCODING_C7S_CODE "C7S"
3188+
#define RSC_PERF_ENCODING_C8_CODE " C8"
3189+
#define RSC_PERF_ENCODING_C9_CODE " C9"
3190+
#define RSC_PERF_ENCODING_C10_CODE "C10"
3191+
#define RSC_PERF_ENCODING_UNS_CODE "UNS"
3192+
30773193
#define RSC_POWER_LABEL_ODCM_CODE "ODCM"
30783194
#define RSC_POWER_LABEL_PWM_CODE "PWR MGMT"
30793195
#define RSC_POWER_LABEL_BIAS_CODE "Bias Hint"

0 commit comments

Comments
 (0)