Skip to content

Commit

Permalink
Processor Events: split log and status event bits
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyring
cyring committed Apr 9, 2022
1 parent ee5a701 commit 52fe0cc
Show file tree
Hide file tree
Showing 8 changed files with 244 additions and 149 deletions.
7 changes: 5 additions & 2 deletions corefreq-cli-rsc-en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1676,9 +1676,12 @@

#define RSC_BOX_EVENT_SPACE_CODE_EN " "
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_EN " Thermal Sensor "
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_EN " PROCHOT "
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_EN " Critical Temp. "
#define RSC_BOX_EVENT_PROCHOT_STS_CODE_EN " PROCHOT "
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_EN " PROCHOT Log "
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_EN " Critical Temp. "
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_EN " Critical Log "
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_EN " Therm Threshold"
#define RSC_BOX_EVENT_THRESHOLD_LOG_CODE_EN " Threshold Log "
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limit. "
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limit. "
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " XDomain Limit. "
Expand Down
7 changes: 5 additions & 2 deletions corefreq-cli-rsc-fr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1163,9 +1163,12 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo

#define RSC_BOX_EVENT_SPACE_CODE_FR " "
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_FR " Capteur therm. "
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_FR " PROCHOT "
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_FR " Temp. critique "
#define RSC_BOX_EVENT_PROCHOT_STS_CODE_FR " PROCHOT "
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_FR " PROCHOT Log "
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_FR " Temp. critique "
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_FR " Log critique "
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_FR " Seuil thermique"
#define RSC_BOX_EVENT_THRESHOLD_LOG_CODE_FR " Log seuil therm"
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance limit"
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Courant limit""\xa9"" "
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Interdomaine "
Expand Down
7 changes: 5 additions & 2 deletions corefreq-cli-rsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1597,9 +1597,12 @@ RESOURCE_ST Resource[] = {
LDT(RSC_BOX_EVENT_TITLE),
LDT(RSC_BOX_EVENT_SPACE),
LDT(RSC_BOX_EVENT_THERMAL_SENSOR),
LDT(RSC_BOX_EVENT_PROCHOT_AGENT),
LDT(RSC_BOX_EVENT_CRITICAL_TEMP),
LDT(RSC_BOX_EVENT_PROCHOT_STS),
LDT(RSC_BOX_EVENT_PROCHOT_LOG),
LDT(RSC_BOX_EVENT_CRITICAL_TMP),
LDT(RSC_BOX_EVENT_CRITICAL_LOG),
LDT(RSC_BOX_EVENT_THERM_THRESHOLD),
LDT(RSC_BOX_EVENT_THRESHOLD_LOG),
LDT(RSC_BOX_EVENT_POWER_LIMIT),
LDT(RSC_BOX_EVENT_CURRENT_LIMIT),
LDT(RSC_BOX_EVENT_CROSS_DOM_LIMIT),
Expand Down
7 changes: 5 additions & 2 deletions corefreq-cli-rsc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1401,9 +1401,12 @@ enum {
RSC_BOX_EVENT_TITLE,
RSC_BOX_EVENT_SPACE,
RSC_BOX_EVENT_THERMAL_SENSOR,
RSC_BOX_EVENT_PROCHOT_AGENT,
RSC_BOX_EVENT_CRITICAL_TEMP,
RSC_BOX_EVENT_PROCHOT_STS,
RSC_BOX_EVENT_PROCHOT_LOG,
RSC_BOX_EVENT_CRITICAL_TMP,
RSC_BOX_EVENT_CRITICAL_LOG,
RSC_BOX_EVENT_THERM_THRESHOLD,
RSC_BOX_EVENT_THRESHOLD_LOG,
RSC_BOX_EVENT_POWER_LIMIT,
RSC_BOX_EVENT_CURRENT_LIMIT,
RSC_BOX_EVENT_CROSS_DOM_LIMIT,
Expand Down
89 changes: 66 additions & 23 deletions corefreq-cli.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9665,27 +9665,39 @@ void UpdateEvent(TGrid *grid, DATA_TYPE data)
memset(grid->cell.attr, attrib.value, grid->cell.length);
}

#define EVENT_DOMAINS 4
#define EVENT_SECTIONS 10

Window *CreateEvents(unsigned long long id)
{
struct EVENT_LDR_ST {
SCANKEY quick;
ASCII *item;
enum THERM_PWR_EVENTS mask;
unsigned short theme;
} evLdr[4][7] = {
} evLdr[EVENT_DOMAINS][EVENT_SECTIONS] = {
{
/* Thermal Sensor */
{ {BOXKEY_CLR_THM_SENSOR},RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
EVENT_THERM_SENSOR , 1 },
/* PROCHOT# Agent */
{ {BOXKEY_CLR_THM_PROCHOT}, RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
EVENT_THERM_PROCHOT , 1 },
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
EVENT_PROCHOT_STS , 1 },
/* PROCHOT# Agent Log */
{ {BOXKEY_CLR_PROCHOT_LOG}, RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
EVENT_PROCHOT_LOG , 1 },
/* Critical Temperature */
{ {BOXKEY_CLR_THM_CRIT} , RSC(BOX_EVENT_CRITICAL_TEMP).CODE(),
EVENT_THERM_CRIT , 1 },
{ {SCANKEY_NULL} , RSC(BOX_EVENT_CRITICAL_TMP).CODE(),
EVENT_CRITIC_TMP , 1 },
/* Critical Temperature Log */
{ {BOXKEY_CLR_THM_CRIT} , RSC(BOX_EVENT_CRITICAL_LOG).CODE(),
EVENT_CRITIC_LOG , 2 },
/* Thermal Threshold */
{ {BOXKEY_CLR_THM_THOLD} , RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
EVENT_THERM_THOLD , 1 },
/* Thermal Threshold Log */
{ {BOXKEY_CLR_THM_THOLD} , RSC(BOX_EVENT_THRESHOLD_LOG).CODE(),
EVENT_THRESHOLD_LOG , 2 },
/* Power Limitation */
{ {BOXKEY_CLR_PWR_LIMIT} , RSC(BOX_EVENT_POWER_LIMIT).CODE(),
EVENT_POWER_LIMIT , 2 },
Expand All @@ -9698,13 +9710,16 @@ Window *CreateEvents(unsigned long long id)
}, {
/* Thermal Sensor */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
EVENT_CORE_STS , 1 },
EVENT_CORE_THM_STS , 1 },
/* PROCHOT# Agent */
{ {BOXKEY_CLR_CORE_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
EVENT_CORE_HOT , 1 },
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
EVENT_CORE_HOT_STS , 1 },
/* PROCHOT# Agent Log */
{ {BOXKEY_CLR_CORE_HOT} , RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
EVENT_CORE_HOT_LOG , 1 },
/* Thermal Log */
{ {BOXKEY_CLR_CORE_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
EVENT_CORE_THM , 1 },
EVENT_CORE_THM_LOG , 1 },
/* Package PL1 */
{ {BOXKEY_CLR_CORE_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
EVENT_CORE_PL1 , 2 },
Expand All @@ -9716,17 +9731,26 @@ Window *CreateEvents(unsigned long long id)
EVENT_CORE_EDP , 2 },
/* Max Turbo Limit. */
{ {BOXKEY_CLR_CORE_TURBO} , RSC(BOX_EVENT_MAX_TURBO).CODE(),
EVENT_CORE_TURBO , 2 }
EVENT_CORE_TURBO , 2 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 }
}, {
/* Thermal Sensor */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
EVENT_GFX_STS , 1 },
EVENT_GFX_THM_STS , 1 },
/* PROCHOT# Agent */
{ {BOXKEY_CLR_GFX_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
EVENT_GFX_HOT , 1 },
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
EVENT_GFX_HOT_STS , 1 },
/* PROCHOT# Agent Log */
{ {BOXKEY_CLR_GFX_HOT} , RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
EVENT_GFX_HOT_LOG , 1 },
/* Thermal Log */
{ {BOXKEY_CLR_GFX_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
EVENT_GFX_THM , 1 },
EVENT_GFX_THM_LOG , 1 },
/* Package PL1 */
{ {BOXKEY_CLR_GFX_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
EVENT_GFX_PL1 , 2 },
Expand All @@ -9737,18 +9761,27 @@ Window *CreateEvents(unsigned long long id)
{ {BOXKEY_CLR_GFX_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
EVENT_GFX_EDP , 2 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 }
}, {
/* Thermal Sensor */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
EVENT_RING_STS , 1 },
EVENT_RING_THM_STS , 1 },
/* PROCHOT# Agent */
{ {BOXKEY_CLR_RING_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
EVENT_RING_HOT , 1 },
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
EVENT_RING_HOT_STS , 0 },
/* PROCHOT# Agent Log */
{ {BOXKEY_CLR_RING_HOT} , RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
EVENT_RING_HOT_LOG , 1 },
/* Thermal Log */
{ {BOXKEY_CLR_RING_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
EVENT_RING_THM , 1 },
EVENT_RING_THM_LOG , 1 },
/* Package PL1 */
{ {BOXKEY_CLR_RING_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
EVENT_RING_PL1 , 2 },
Expand All @@ -9759,20 +9792,27 @@ Window *CreateEvents(unsigned long long id)
{ {BOXKEY_CLR_RING_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
EVENT_RING_EDP , 2 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 },
/* Blank cell */
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
EVENT_THERM_NONE , 0 }
}
};
const size_t nmemb = sizeof(evLdr) / sizeof(struct EVENT_LDR_ST);

Window *wEvent = CreateWindow( wLayer, id,
4, nmemb / 4, 6, TOP_HEADER_ROW + 2 );
EVENT_DOMAINS, nmemb / EVENT_DOMAINS,
6, TOP_HEADER_ROW + 2 );
if (wEvent != NULL)
{
DATA_TYPE data;
CUINT col, row;
for (row = 0; row < 7; row++) {
for (col = 0; col < 4; col++) {
for (row = 0; row < EVENT_SECTIONS; row++) {
for (col = 0; col < EVENT_DOMAINS; col++) {
const unsigned short theme = ProcessorEvents & evLdr[col][row].mask ?
evLdr[col][row].theme : 0;

Expand Down Expand Up @@ -9815,6 +9855,9 @@ Window *CreateEvents(unsigned long long id)
return wEvent;
}

#undef EVENT_DOMAINS
#undef EVENT_SECTIONS

Window *CreateRecorder(unsigned long long id)
{
Window *wRec = CreateWindow( wLayer, id,
Expand Down Expand Up @@ -13393,7 +13436,7 @@ int Shortcut(SCANKEY *scan)
break;

case BOXKEY_CLR_THM_SENSOR:
case BOXKEY_CLR_THM_PROCHOT:
case BOXKEY_CLR_PROCHOT_LOG:
case BOXKEY_CLR_THM_CRIT:
case BOXKEY_CLR_THM_THOLD:
case BOXKEY_CLR_PWR_LIMIT:
Expand Down
40 changes: 20 additions & 20 deletions corefreq-cli.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,25 +286,25 @@ enum KEY_ENUM {
BOXKEY_LIMIT_IDLE_ST10 = 0x30000000000148a1LLU,

BOXKEY_CLR_THM_SENSOR = BOXKEY_EVT_OR | (LSHIFT_THERM_SENSOR << 2),
BOXKEY_CLR_THM_PROCHOT = BOXKEY_EVT_OR | (LSHIFT_THERM_PROCHOT << 2),
BOXKEY_CLR_THM_CRIT = BOXKEY_EVT_OR | (LSHIFT_THERM_CRIT << 2),
BOXKEY_CLR_PROCHOT_LOG = BOXKEY_EVT_OR | (LSHIFT_PROCHOT_LOG << 2),
BOXKEY_CLR_THM_CRIT = BOXKEY_EVT_OR | (LSHIFT_CRITIC_LOG << 2),
BOXKEY_CLR_THM_THOLD = BOXKEY_EVT_OR | (LSHIFT_THERM_THOLD << 2),
BOXKEY_CLR_PWR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_POWER_LIMIT << 2),
BOXKEY_CLR_CUR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_CURRENT_LIMIT << 2),
BOXKEY_CLR_X_DOMAIN = BOXKEY_EVT_OR | (LSHIFT_CROSS_DOMAIN << 2),
BOXKEY_CLR_CORE_HOT = BOXKEY_EVT_OR | (LSHIFT_CORE_HOT << 2),
BOXKEY_CLR_CORE_THM = BOXKEY_EVT_OR | (LSHIFT_CORE_THM << 2),
BOXKEY_CLR_CORE_HOT = BOXKEY_EVT_OR | (LSHIFT_CORE_HOT_LOG << 2),
BOXKEY_CLR_CORE_THM = BOXKEY_EVT_OR | (LSHIFT_CORE_THM_LOG << 2),
BOXKEY_CLR_CORE_PL1 = BOXKEY_EVT_OR | (LSHIFT_CORE_PL1 << 2),
BOXKEY_CLR_CORE_PL2 = BOXKEY_EVT_OR | (LSHIFT_CORE_PL2 << 2),
BOXKEY_CLR_CORE_EDP = BOXKEY_EVT_OR | (LSHIFT_CORE_EDP << 2),
BOXKEY_CLR_CORE_TURBO = BOXKEY_EVT_OR | (LSHIFT_CORE_TURBO << 2),
BOXKEY_CLR_GFX_HOT = BOXKEY_EVT_OR | (LSHIFT_GFX_HOT << 2),
BOXKEY_CLR_GFX_THM = BOXKEY_EVT_OR | (LSHIFT_GFX_THM << 2),
BOXKEY_CLR_GFX_HOT = BOXKEY_EVT_OR | (LSHIFT_GFX_HOT_LOG << 2),
BOXKEY_CLR_GFX_THM = BOXKEY_EVT_OR | (LSHIFT_GFX_THM_LOG << 2),
BOXKEY_CLR_GFX_PL1 = BOXKEY_EVT_OR | (LSHIFT_GFX_PL1 << 2),
BOXKEY_CLR_GFX_PL2 = BOXKEY_EVT_OR | (LSHIFT_GFX_PL2 << 2),
BOXKEY_CLR_GFX_EDP = BOXKEY_EVT_OR | (LSHIFT_GFX_EDP << 2),
BOXKEY_CLR_RING_HOT = BOXKEY_EVT_OR | (LSHIFT_RING_HOT << 2),
BOXKEY_CLR_RING_THM = BOXKEY_EVT_OR | (LSHIFT_RING_THM << 2),
BOXKEY_CLR_RING_HOT = BOXKEY_EVT_OR | (LSHIFT_RING_HOT_LOG << 2),
BOXKEY_CLR_RING_THM = BOXKEY_EVT_OR | (LSHIFT_RING_THM_LOG << 2),
BOXKEY_CLR_RING_PL1 = BOXKEY_EVT_OR | (LSHIFT_RING_PL1 << 2),
BOXKEY_CLR_RING_PL2 = BOXKEY_EVT_OR | (LSHIFT_RING_PL2 << 2),
BOXKEY_CLR_RING_EDP = BOXKEY_EVT_OR | (LSHIFT_RING_EDP << 2),
Expand Down Expand Up @@ -628,7 +628,7 @@ int CheckDuplicateKey(void) \
case BOXKEY_LIMIT_IDLE_ST10: \
\
case BOXKEY_CLR_THM_SENSOR: \
case BOXKEY_CLR_THM_PROCHOT: \
case BOXKEY_CLR_PROCHOT_LOG: \
case BOXKEY_CLR_THM_CRIT: \
case BOXKEY_CLR_THM_THOLD: \
case BOXKEY_CLR_PWR_LIMIT: \
Expand Down Expand Up @@ -944,18 +944,18 @@ struct RECORDER_ST {

#define HOT_EVENT_FILTER ( ALL_EVENT_MASK \
& ( EVENT_THERM_SENSOR \
| EVENT_THERM_PROCHOT \
| EVENT_THERM_CRIT \
| EVENT_THERM_THOLD \
| EVENT_CORE_STS \
| EVENT_CORE_HOT \
| EVENT_GFX_STS \
| EVENT_GFX_HOT \
| EVENT_RING_STS \
| EVENT_RING_HOT ) )
| EVENT_PROCHOT_LOG \
| EVENT_CRITIC_LOG \
| EVENT_THRESHOLD_LOG \
| EVENT_CORE_THM_STS \
| EVENT_CORE_HOT_STS \
| EVENT_GFX_THM_STS \
| EVENT_GFX_HOT_STS \
| EVENT_RING_THM_STS \
| EVENT_RING_HOT_STS ) )

#define THERMAL_EVENT_FILTER ( ALL_EVENT_MASK \
& ( EVENT_THERM_SENSOR \
| EVENT_THERM_PROCHOT \
| EVENT_THERM_CRIT \
| EVENT_PROCHOT_STS \
| EVENT_CRITIC_TMP \
| EVENT_THERM_THOLD ) )
Loading

0 comments on commit 52fe0cc

Please sign in to comment.