Skip to content

Commit

Permalink
Code review: various UI strings moved to the Resource table
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyring
cyring committed May 2, 2021
1 parent 8204ff9 commit b263200
Show file tree
Hide file tree
Showing 5 changed files with 393 additions and 164 deletions.
2 changes: 2 additions & 0 deletions corefreq-cli-rsc-en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,8 @@
#define RSC_COUNTERS_CODE_EN "Counters"
#define RSC_GENERAL_CTRS_CODE_EN "General"
#define RSC_FIXED_CTRS_CODE_EN "Fixed"
#define RSC_PERF_MON_UNIT_BIT_CODE_EN "bits"
#define RSC_PERF_MON_UNIT_HWP_CODE_EN "(MHz)"
#define RSC_PERF_MON_C1E_CODE_EN "Enhanced Halt State"
#define RSC_PERF_MON_C1A_CODE_EN "C1 Auto Demotion"
#define RSC_PERF_MON_C3A_CODE_EN "C3 Auto Demotion"
Expand Down
2 changes: 2 additions & 0 deletions corefreq-cli-rsc-fr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,8 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
#define RSC_COUNTERS_CODE_FR "Compteurs"
#define RSC_GENERAL_CTRS_CODE_FR "G""\xa9""n""\xa9""raux"
#define RSC_FIXED_CTRS_CODE_FR "Fixes"
#define RSC_PERF_MON_UNIT_BIT_CODE_FR "bits"
#define RSC_PERF_MON_UNIT_HWP_CODE_FR "(MHz)"
#define RSC_PERF_MON_C1E_CODE_FR "Enhanced Halt State"
#define RSC_PERF_MON_C1A_CODE_FR "C1 Auto Demotion"
#define RSC_PERF_MON_C3A_CODE_FR "C3 Auto Demotion"
Expand Down
59 changes: 59 additions & 0 deletions corefreq-cli-rsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1090,8 +1090,19 @@ RESOURCE_ST Resource[] = {
RSC_RECORDER_CODE_FR),
[RSC_STRESS] = LDT( RSC_STRESS_CODE_EN,
RSC_STRESS_CODE_FR),
[RSC_FREQ_UNIT_MHZ] = LDQ( RSC_FREQ_UNIT_MHZ_CODE),
[RSC_PPIN] = LDQ( RSC_PPIN_CODE),
[RSC_PSTATE] = LDQ( RSC_PSTATE_CODE),
[RSC_UNCORE] = LDQ( RSC_UNCORE_CODE),
[RSC_BOOST] = LDQ( RSC_BOOST_CODE),
[RSC_TURBO] = LDQ( RSC_TURBO_CODE),
[RSC_MAX] = LDQ( RSC_MAX_CODE),
[RSC_MIN] = LDQ( RSC_MIN_CODE),
[RSC_TGT] = LDQ( RSC_TGT_CODE),
[RSC_HWP] = LDQ( RSC_HWP_CODE),
[RSC_XFR] = LDQ( RSC_XFR_CODE),
[RSC_CPB] = LDQ( RSC_CPB_CODE),
[RSC_TDP] = LDQ( RSC_TDP_CODE),
[RSC_ACT] = LDQ( RSC_ACT_CODE),
[RSC_SCOPE_NONE] = LDT( RSC_SCOPE_NONE_CODE_EN,
RSC_SCOPE_NONE_CODE_FR),
Expand Down Expand Up @@ -1456,6 +1467,8 @@ RESOURCE_ST Resource[] = {
RSC_VARIANT_CODE_FR),
[RSC_INVARIANT] = LDT( RSC_INVARIANT_CODE_EN,
RSC_INVARIANT_CODE_FR),
[RSC_XAPIC] = LDQ( RSC_XAPIC_CODE),
[RSC_X2APIC] = LDQ( RSC_X2APIC_CODE),
[RSC_FEATURES_1GB_PAGES]= LDT( RSC_FEATURES_1GB_PAGES_CODE_EN,
RSC_FEATURES_1GB_PAGES_CODE_FR),
[RSC_FEATURES_100MHZ] = LDT( RSC_FEATURES_100MHZ_CODE_EN,
Expand Down Expand Up @@ -1596,6 +1609,14 @@ RESOURCE_ST Resource[] = {
RSC_TECHNOLOGIES_R2H_CODE_FR),
[RSC_TECHNOLOGIES_HYPERV]=LDT( RSC_TECHNOLOGIES_HYPERV_CODE_EN,
RSC_TECHNOLOGIES_HYPERV_CODE_FR),
[RSC_TECH_HYPERV_NONE] = LDQ( RSC_TECH_HYPERV_NONE_CODE),
[RSC_TECH_BARE_METAL] = LDQ( RSC_TECH_BARE_METAL_CODE),
[RSC_TECH_HYPERV_XEN] = LDQ( RSC_TECH_HYPERV_XEN_CODE),
[RSC_TECH_HYPERV_KVM] = LDQ( RSC_TECH_HYPERV_KVM_CODE),
[RSC_TECH_HYPERV_VBOX] = LDQ( RSC_TECH_HYPERV_VBOX_CODE),
[RSC_TECH_HYPERV_KBOX] = LDQ( RSC_TECH_HYPERV_KBOX_CODE),
[RSC_TECH_HYPERV_VMWARE]= LDQ( RSC_TECH_HYPERV_VMWARE_CODE),
[RSC_TECH_HYPERV_HYPERV]= LDQ( RSC_TECH_HYPERV_HYPERV_CODE),
[RSC_PERF_MON_TITLE] = LDT( RSC_PERF_MON_TITLE_CODE_EN,
RSC_PERF_MON_TITLE_CODE_FR),
[RSC_VERSION] = LDT( RSC_VERSION_CODE_EN,
Expand All @@ -1606,6 +1627,10 @@ RESOURCE_ST Resource[] = {
RSC_GENERAL_CTRS_CODE_FR),
[RSC_FIXED_CTRS] = LDT( RSC_FIXED_CTRS_CODE_EN,
RSC_FIXED_CTRS_CODE_FR),
[RSC_PERF_MON_UNIT_BIT] = LDT( RSC_PERF_MON_UNIT_BIT_CODE_EN,
RSC_PERF_MON_UNIT_BIT_CODE_FR),
[RSC_PERF_MON_UNIT_HWP] = LDT( RSC_PERF_MON_UNIT_HWP_CODE_EN,
RSC_PERF_MON_UNIT_HWP_CODE_FR),
[RSC_PERF_MON_C1E] = LDT( RSC_PERF_MON_C1E_CODE_EN,
RSC_PERF_MON_C1E_CODE_FR),
[RSC_PERF_MON_C1A] = LDT( RSC_PERF_MON_C1A_CODE_EN,
Expand Down Expand Up @@ -1676,6 +1701,40 @@ RESOURCE_ST Resource[] = {
RSC_PERF_MON_NB_DF_CODE_FR),
[RSC_PERF_MON_CORE] = LDT( RSC_PERF_MON_CORE_CODE_EN,
RSC_PERF_MON_CORE_CODE_FR),
[RSC_PERF_LABEL_VER] = LDQ( RSC_PERF_LABEL_VER_CODE),
[RSC_PERF_LABEL_C1E] = LDQ( RSC_PERF_LABEL_C1E_CODE),
[RSC_PERF_LABEL_C1A] = LDQ( RSC_PERF_LABEL_C1A_CODE),
[RSC_PERF_LABEL_C3A] = LDQ( RSC_PERF_LABEL_C3A_CODE),
[RSC_PERF_LABEL_C1U] = LDQ( RSC_PERF_LABEL_C1U_CODE),
[RSC_PERF_LABEL_C2U] = LDQ( RSC_PERF_LABEL_C2U_CODE),
[RSC_PERF_LABEL_C3U] = LDQ( RSC_PERF_LABEL_C3U_CODE),
[RSC_PERF_LABEL_CC6] = LDQ( RSC_PERF_LABEL_CC6_CODE),
[RSC_PERF_LABEL_PC6] = LDQ( RSC_PERF_LABEL_PC6_CODE),
[RSC_PERF_LABEL_MC6] = LDQ( RSC_PERF_LABEL_MC6_CODE),
[RSC_PERF_LABEL_FID] = LDQ( RSC_PERF_LABEL_FID_CODE),
[RSC_PERF_LABEL_VID] = LDQ( RSC_PERF_LABEL_VID_CODE),
[RSC_PERF_LABEL_HWCF] = LDQ( RSC_PERF_LABEL_HWCF_CODE),
[RSC_PERF_LABEL_HWP] = LDQ( RSC_PERF_LABEL_HWP_CODE),
[RSC_PERF_LABEL_HDC] = LDQ( RSC_PERF_LABEL_HDC_CODE),
[RSC_PERF_LABEL_CFG_CTRL]=LDQ( RSC_PERF_LABEL_CFG_CTRL_CODE),
[RSC_PERF_LABEL_LOW_CST]= LDQ( RSC_PERF_LABEL_LOW_CST_CODE),
[RSC_PERF_LABEL_IOMWAIT]= LDQ( RSC_PERF_LABEL_IOMWAIT_CODE),
[RSC_PERF_LABEL_MAX_CST]= LDQ( RSC_PERF_LABEL_MAX_CST_CODE),
[RSC_PERF_LABEL_CST_BAR]= LDQ( RSC_PERF_LABEL_CST_BAR_CODE),
[RSC_PERF_LABEL_MWAIT_IDX]=LDQ( RSC_PERF_LABEL_MWAIT_IDX_CODE),
[RSC_PERF_ENCODING_C0] = LDQ( RSC_PERF_ENCODING_C0_CODE),
[RSC_PERF_ENCODING_C1] = LDQ( RSC_PERF_ENCODING_C1_CODE),
[RSC_PERF_ENCODING_C2] = LDQ( RSC_PERF_ENCODING_C2_CODE),
[RSC_PERF_ENCODING_C3] = LDQ( RSC_PERF_ENCODING_C3_CODE),
[RSC_PERF_ENCODING_C4] = LDQ( RSC_PERF_ENCODING_C4_CODE),
[RSC_PERF_ENCODING_C6] = LDQ( RSC_PERF_ENCODING_C6_CODE),
[RSC_PERF_ENCODING_C6R] = LDQ( RSC_PERF_ENCODING_C6R_CODE),
[RSC_PERF_ENCODING_C7] = LDQ( RSC_PERF_ENCODING_C7_CODE),
[RSC_PERF_ENCODING_C7S] = LDQ( RSC_PERF_ENCODING_C7S_CODE),
[RSC_PERF_ENCODING_C8] = LDQ( RSC_PERF_ENCODING_C8_CODE),
[RSC_PERF_ENCODING_C9] = LDQ( RSC_PERF_ENCODING_C9_CODE),
[RSC_PERF_ENCODING_C10] = LDQ( RSC_PERF_ENCODING_C10_CODE),
[RSC_PERF_ENCODING_UNS] = LDQ( RSC_PERF_ENCODING_UNS_CODE),
[RSC_POWER_THERMAL_TITLE]=LDT( RSC_POWER_THERMAL_TITLE_CODE_EN,
RSC_POWER_THERMAL_TITLE_CODE_FR),
[RSC_POWER_THERMAL_ODCM]=LDT( RSC_POWER_THERMAL_ODCM_CODE_EN,
Expand Down
116 changes: 116 additions & 0 deletions corefreq-cli-rsc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,19 @@ enum {
RSC_HIGHEST,
RSC_RECORDER,
RSC_STRESS,
RSC_FREQ_UNIT_MHZ,
RSC_PPIN,
RSC_PSTATE,
RSC_UNCORE,
RSC_BOOST,
RSC_TURBO,
RSC_MAX,
RSC_MIN,
RSC_TGT,
RSC_HWP,
RSC_XFR,
RSC_CPB,
RSC_TDP,
RSC_ACT,
RSC_SCOPE_NONE,
RSC_SCOPE_THREAD,
Expand Down Expand Up @@ -457,6 +468,8 @@ enum {
RSC_PRESENT,
RSC_VARIANT,
RSC_INVARIANT,
RSC_XAPIC,
RSC_X2APIC,
RSC_FEATURES_1GB_PAGES,
RSC_FEATURES_100MHZ,
RSC_FEATURES_ACPI,
Expand Down Expand Up @@ -527,11 +540,21 @@ enum {
RSC_TECHNOLOGIES_CPB,
RSC_TECHNOLOGIES_R2H,
RSC_TECHNOLOGIES_HYPERV,
RSC_TECH_HYPERV_NONE,
RSC_TECH_BARE_METAL,
RSC_TECH_HYPERV_XEN,
RSC_TECH_HYPERV_KVM,
RSC_TECH_HYPERV_VBOX,
RSC_TECH_HYPERV_KBOX,
RSC_TECH_HYPERV_VMWARE,
RSC_TECH_HYPERV_HYPERV,
RSC_PERF_MON_TITLE,
RSC_VERSION,
RSC_COUNTERS,
RSC_GENERAL_CTRS,
RSC_FIXED_CTRS,
RSC_PERF_MON_UNIT_BIT,
RSC_PERF_MON_UNIT_HWP,
RSC_PERF_MON_C1E,
RSC_PERF_MON_C1A,
RSC_PERF_MON_C3A,
Expand Down Expand Up @@ -567,6 +590,40 @@ enum {
RSC_PERF_MON_TSC,
RSC_PERF_MON_NB_DF,
RSC_PERF_MON_CORE,
RSC_PERF_LABEL_VER,
RSC_PERF_LABEL_C1E,
RSC_PERF_LABEL_C1A,
RSC_PERF_LABEL_C3A,
RSC_PERF_LABEL_C1U,
RSC_PERF_LABEL_C2U,
RSC_PERF_LABEL_C3U,
RSC_PERF_LABEL_CC6,
RSC_PERF_LABEL_PC6,
RSC_PERF_LABEL_MC6,
RSC_PERF_LABEL_FID,
RSC_PERF_LABEL_VID,
RSC_PERF_LABEL_HWCF,
RSC_PERF_LABEL_HWP,
RSC_PERF_LABEL_HDC,
RSC_PERF_LABEL_CFG_CTRL,
RSC_PERF_LABEL_LOW_CST,
RSC_PERF_LABEL_IOMWAIT,
RSC_PERF_LABEL_MAX_CST,
RSC_PERF_LABEL_CST_BAR,
RSC_PERF_LABEL_MWAIT_IDX,
RSC_PERF_ENCODING_C0,
RSC_PERF_ENCODING_C1,
RSC_PERF_ENCODING_C2,
RSC_PERF_ENCODING_C3,
RSC_PERF_ENCODING_C4,
RSC_PERF_ENCODING_C6,
RSC_PERF_ENCODING_C6R,
RSC_PERF_ENCODING_C7,
RSC_PERF_ENCODING_C7S,
RSC_PERF_ENCODING_C8,
RSC_PERF_ENCODING_C9,
RSC_PERF_ENCODING_C10,
RSC_PERF_ENCODING_UNS,
RSC_POWER_THERMAL_TITLE,
RSC_POWER_THERMAL_ODCM,
RSC_POWER_THERMAL_DUTY,
Expand Down Expand Up @@ -3055,9 +3112,22 @@ extern RESOURCE_ST Resource[];
HBK,HBK,HBK,HBK,HBK,HBK,HBK,HBK,HBK \
}

#define RSC_FREQ_UNIT_MHZ_CODE "(MHz)"
#define RSC_PPIN_CODE "PPIN#"
#define RSC_PSTATE_CODE "P-State"
#define RSC_UNCORE_CODE "Uncore"
#define RSC_BOOST_CODE "Turbo Boost"
#define RSC_TURBO_CODE "Turbo"
#define RSC_MAX_CODE "Max"
#define RSC_MIN_CODE "Min"
#define RSC_TGT_CODE "TGT"
#define RSC_HWP_CODE "HWP"
#define RSC_XFR_CODE "XFR"
#define RSC_CPB_CODE "CPB"
#define RSC_TDP_CODE "TDP"
#define RSC_ACT_CODE "Activ"
#define RSC_XAPIC_CODE " xAPIC"
#define RSC_X2APIC_CODE " x2APIC"

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

#define RSC_TECH_HYPERV_NONE_CODE " "
#define RSC_TECH_BARE_METAL_CODE "Bare-Metal"
#define RSC_TECH_HYPERV_XEN_CODE " Xen"
#define RSC_TECH_HYPERV_KVM_CODE " KVM"
#define RSC_TECH_HYPERV_VBOX_CODE "VirtualBox"
#define RSC_TECH_HYPERV_KBOX_CODE " KVM/VBox"
#define RSC_TECH_HYPERV_VMWARE_CODE " VMware"
#define RSC_TECH_HYPERV_HYPERV_CODE "MS Hyper-V"

#define RSC_PERF_LABEL_VER_CODE "PM"
#define RSC_PERF_LABEL_C1E_CODE "C1E"
#define RSC_PERF_LABEL_C1A_CODE "C1A"
#define RSC_PERF_LABEL_C3A_CODE "C3A"
#define RSC_PERF_LABEL_C1U_CODE "C1U"
#define RSC_PERF_LABEL_C2U_CODE "C2U"
#define RSC_PERF_LABEL_C3U_CODE "C3U"
#define RSC_PERF_LABEL_CC6_CODE "CC6"
#define RSC_PERF_LABEL_PC6_CODE "PC6"
#define RSC_PERF_LABEL_MC6_CODE "MC6"
#define RSC_PERF_LABEL_FID_CODE "FID"
#define RSC_PERF_LABEL_VID_CODE "VID"
#define RSC_PERF_LABEL_HWCF_CODE "MPERF/APERF"
#define RSC_PERF_LABEL_HWP_CODE "HWP"
#define RSC_PERF_LABEL_HDC_CODE "HDC"
#define RSC_PERF_LABEL_CFG_CTRL_CODE "CONFIG"
#define RSC_PERF_LABEL_LOW_CST_CODE "LIMIT"
#define RSC_PERF_LABEL_IOMWAIT_CODE "IOMWAIT"
#define RSC_PERF_LABEL_MAX_CST_CODE "RANGE"
#define RSC_PERF_LABEL_CST_BAR_CODE "BAR"
#define RSC_PERF_LABEL_MWAIT_IDX_CODE \
"#0 #1 #2 #3 #4 #5 #6 #7"

#define RSC_PERF_ENCODING_C0_CODE " C0"
#define RSC_PERF_ENCODING_C1_CODE " C1"
#define RSC_PERF_ENCODING_C2_CODE " C2"
#define RSC_PERF_ENCODING_C3_CODE " C3"
#define RSC_PERF_ENCODING_C4_CODE " C4"
#define RSC_PERF_ENCODING_C6_CODE " C6"
#define RSC_PERF_ENCODING_C6R_CODE "C6R"
#define RSC_PERF_ENCODING_C7_CODE " C7"
#define RSC_PERF_ENCODING_C7S_CODE "C7S"
#define RSC_PERF_ENCODING_C8_CODE " C8"
#define RSC_PERF_ENCODING_C9_CODE " C9"
#define RSC_PERF_ENCODING_C10_CODE "C10"
#define RSC_PERF_ENCODING_UNS_CODE "UNS"

#define RSC_POWER_LABEL_ODCM_CODE "ODCM"
#define RSC_POWER_LABEL_PWM_CODE "PWR MGMT"
#define RSC_POWER_LABEL_BIAS_CODE "Bias Hint"
Expand Down
Loading

0 comments on commit b263200

Please sign in to comment.