Skip to content

Commit 52fe0cc

Browse files
cyringcyring
committed
Processor Events: split log and status event bits
1 parent ee5a701 commit 52fe0cc

8 files changed

+244
-149
lines changed

‎corefreq-cli-rsc-en.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -1676,9 +1676,12 @@
16761676

16771677
#define RSC_BOX_EVENT_SPACE_CODE_EN " "
16781678
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_EN " Thermal Sensor "
1679-
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_EN " PROCHOT "
1680-
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_EN " Critical Temp. "
1679+
#define RSC_BOX_EVENT_PROCHOT_STS_CODE_EN " PROCHOT "
1680+
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_EN " PROCHOT Log "
1681+
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_EN " Critical Temp. "
1682+
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_EN " Critical Log "
16811683
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_EN " Therm Threshold"
1684+
#define RSC_BOX_EVENT_THRESHOLD_LOG_CODE_EN " Threshold Log "
16821685
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_EN " Power Limit. "
16831686
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_EN " Current Limit. "
16841687
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_EN " XDomain Limit. "

‎corefreq-cli-rsc-fr.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -1163,9 +1163,12 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
11631163

11641164
#define RSC_BOX_EVENT_SPACE_CODE_FR " "
11651165
#define RSC_BOX_EVENT_THERMAL_SENSOR_CODE_FR " Capteur therm. "
1166-
#define RSC_BOX_EVENT_PROCHOT_AGENT_CODE_FR " PROCHOT "
1167-
#define RSC_BOX_EVENT_CRITICAL_TEMP_CODE_FR " Temp. critique "
1166+
#define RSC_BOX_EVENT_PROCHOT_STS_CODE_FR " PROCHOT "
1167+
#define RSC_BOX_EVENT_PROCHOT_LOG_CODE_FR " PROCHOT Log "
1168+
#define RSC_BOX_EVENT_CRITICAL_TMP_CODE_FR " Temp. critique "
1169+
#define RSC_BOX_EVENT_CRITICAL_LOG_CODE_FR " Log critique "
11681170
#define RSC_BOX_EVENT_THERM_THRESHOLD_CODE_FR " Seuil thermique"
1171+
#define RSC_BOX_EVENT_THRESHOLD_LOG_CODE_FR " Log seuil therm"
11691172
#define RSC_BOX_EVENT_POWER_LIMIT_CODE_FR " Puissance limit"
11701173
#define RSC_BOX_EVENT_CURRENT_LIMIT_CODE_FR " Courant limit""\xa9"" "
11711174
#define RSC_BOX_EVENT_CROSS_DOM_LIMIT_CODE_FR " Interdomaine "

‎corefreq-cli-rsc.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -1597,9 +1597,12 @@ RESOURCE_ST Resource[] = {
15971597
LDT(RSC_BOX_EVENT_TITLE),
15981598
LDT(RSC_BOX_EVENT_SPACE),
15991599
LDT(RSC_BOX_EVENT_THERMAL_SENSOR),
1600-
LDT(RSC_BOX_EVENT_PROCHOT_AGENT),
1601-
LDT(RSC_BOX_EVENT_CRITICAL_TEMP),
1600+
LDT(RSC_BOX_EVENT_PROCHOT_STS),
1601+
LDT(RSC_BOX_EVENT_PROCHOT_LOG),
1602+
LDT(RSC_BOX_EVENT_CRITICAL_TMP),
1603+
LDT(RSC_BOX_EVENT_CRITICAL_LOG),
16021604
LDT(RSC_BOX_EVENT_THERM_THRESHOLD),
1605+
LDT(RSC_BOX_EVENT_THRESHOLD_LOG),
16031606
LDT(RSC_BOX_EVENT_POWER_LIMIT),
16041607
LDT(RSC_BOX_EVENT_CURRENT_LIMIT),
16051608
LDT(RSC_BOX_EVENT_CROSS_DOM_LIMIT),

‎corefreq-cli-rsc.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -1401,9 +1401,12 @@ enum {
14011401
RSC_BOX_EVENT_TITLE,
14021402
RSC_BOX_EVENT_SPACE,
14031403
RSC_BOX_EVENT_THERMAL_SENSOR,
1404-
RSC_BOX_EVENT_PROCHOT_AGENT,
1405-
RSC_BOX_EVENT_CRITICAL_TEMP,
1404+
RSC_BOX_EVENT_PROCHOT_STS,
1405+
RSC_BOX_EVENT_PROCHOT_LOG,
1406+
RSC_BOX_EVENT_CRITICAL_TMP,
1407+
RSC_BOX_EVENT_CRITICAL_LOG,
14061408
RSC_BOX_EVENT_THERM_THRESHOLD,
1409+
RSC_BOX_EVENT_THRESHOLD_LOG,
14071410
RSC_BOX_EVENT_POWER_LIMIT,
14081411
RSC_BOX_EVENT_CURRENT_LIMIT,
14091412
RSC_BOX_EVENT_CROSS_DOM_LIMIT,

‎corefreq-cli.c

+66-23
Original file line numberDiff line numberDiff line change
@@ -9665,27 +9665,39 @@ void UpdateEvent(TGrid *grid, DATA_TYPE data)
96659665
memset(grid->cell.attr, attrib.value, grid->cell.length);
96669666
}
96679667

9668+
#define EVENT_DOMAINS 4
9669+
#define EVENT_SECTIONS 10
9670+
96689671
Window *CreateEvents(unsigned long long id)
96699672
{
96709673
struct EVENT_LDR_ST {
96719674
SCANKEY quick;
96729675
ASCII *item;
96739676
enum THERM_PWR_EVENTS mask;
96749677
unsigned short theme;
9675-
} evLdr[4][7] = {
9678+
} evLdr[EVENT_DOMAINS][EVENT_SECTIONS] = {
96769679
{
96779680
/* Thermal Sensor */
96789681
{ {BOXKEY_CLR_THM_SENSOR},RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
96799682
EVENT_THERM_SENSOR , 1 },
96809683
/* PROCHOT# Agent */
9681-
{ {BOXKEY_CLR_THM_PROCHOT}, RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9682-
EVENT_THERM_PROCHOT , 1 },
9684+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
9685+
EVENT_PROCHOT_STS , 1 },
9686+
/* PROCHOT# Agent Log */
9687+
{ {BOXKEY_CLR_PROCHOT_LOG}, RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
9688+
EVENT_PROCHOT_LOG , 1 },
96839689
/* Critical Temperature */
9684-
{ {BOXKEY_CLR_THM_CRIT} , RSC(BOX_EVENT_CRITICAL_TEMP).CODE(),
9685-
EVENT_THERM_CRIT , 1 },
9690+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_CRITICAL_TMP).CODE(),
9691+
EVENT_CRITIC_TMP , 1 },
9692+
/* Critical Temperature Log */
9693+
{ {BOXKEY_CLR_THM_CRIT} , RSC(BOX_EVENT_CRITICAL_LOG).CODE(),
9694+
EVENT_CRITIC_LOG , 2 },
96869695
/* Thermal Threshold */
9687-
{ {BOXKEY_CLR_THM_THOLD} , RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
9696+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERM_THRESHOLD).CODE(),
96889697
EVENT_THERM_THOLD , 1 },
9698+
/* Thermal Threshold Log */
9699+
{ {BOXKEY_CLR_THM_THOLD} , RSC(BOX_EVENT_THRESHOLD_LOG).CODE(),
9700+
EVENT_THRESHOLD_LOG , 2 },
96899701
/* Power Limitation */
96909702
{ {BOXKEY_CLR_PWR_LIMIT} , RSC(BOX_EVENT_POWER_LIMIT).CODE(),
96919703
EVENT_POWER_LIMIT , 2 },
@@ -9698,13 +9710,16 @@ Window *CreateEvents(unsigned long long id)
96989710
}, {
96999711
/* Thermal Sensor */
97009712
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9701-
EVENT_CORE_STS , 1 },
9713+
EVENT_CORE_THM_STS , 1 },
97029714
/* PROCHOT# Agent */
9703-
{ {BOXKEY_CLR_CORE_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9704-
EVENT_CORE_HOT , 1 },
9715+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
9716+
EVENT_CORE_HOT_STS , 1 },
9717+
/* PROCHOT# Agent Log */
9718+
{ {BOXKEY_CLR_CORE_HOT} , RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
9719+
EVENT_CORE_HOT_LOG , 1 },
97059720
/* Thermal Log */
97069721
{ {BOXKEY_CLR_CORE_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
9707-
EVENT_CORE_THM , 1 },
9722+
EVENT_CORE_THM_LOG , 1 },
97089723
/* Package PL1 */
97099724
{ {BOXKEY_CLR_CORE_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
97109725
EVENT_CORE_PL1 , 2 },
@@ -9716,17 +9731,26 @@ Window *CreateEvents(unsigned long long id)
97169731
EVENT_CORE_EDP , 2 },
97179732
/* Max Turbo Limit. */
97189733
{ {BOXKEY_CLR_CORE_TURBO} , RSC(BOX_EVENT_MAX_TURBO).CODE(),
9719-
EVENT_CORE_TURBO , 2 }
9734+
EVENT_CORE_TURBO , 2 },
9735+
/* Blank cell */
9736+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9737+
EVENT_THERM_NONE , 0 },
9738+
/* Blank cell */
9739+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9740+
EVENT_THERM_NONE , 0 }
97209741
}, {
97219742
/* Thermal Sensor */
97229743
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9723-
EVENT_GFX_STS , 1 },
9744+
EVENT_GFX_THM_STS , 1 },
97249745
/* PROCHOT# Agent */
9725-
{ {BOXKEY_CLR_GFX_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9726-
EVENT_GFX_HOT , 1 },
9746+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
9747+
EVENT_GFX_HOT_STS , 1 },
9748+
/* PROCHOT# Agent Log */
9749+
{ {BOXKEY_CLR_GFX_HOT} , RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
9750+
EVENT_GFX_HOT_LOG , 1 },
97279751
/* Thermal Log */
97289752
{ {BOXKEY_CLR_GFX_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
9729-
EVENT_GFX_THM , 1 },
9753+
EVENT_GFX_THM_LOG , 1 },
97309754
/* Package PL1 */
97319755
{ {BOXKEY_CLR_GFX_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
97329756
EVENT_GFX_PL1 , 2 },
@@ -9737,18 +9761,27 @@ Window *CreateEvents(unsigned long long id)
97379761
{ {BOXKEY_CLR_GFX_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
97389762
EVENT_GFX_EDP , 2 },
97399763
/* Blank cell */
9764+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9765+
EVENT_THERM_NONE , 0 },
9766+
/* Blank cell */
9767+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9768+
EVENT_THERM_NONE , 0 },
9769+
/* Blank cell */
97409770
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
97419771
EVENT_THERM_NONE , 0 }
97429772
}, {
97439773
/* Thermal Sensor */
97449774
{ {SCANKEY_NULL} , RSC(BOX_EVENT_THERMAL_SENSOR).CODE(),
9745-
EVENT_RING_STS , 1 },
9775+
EVENT_RING_THM_STS , 1 },
97469776
/* PROCHOT# Agent */
9747-
{ {BOXKEY_CLR_RING_HOT} , RSC(BOX_EVENT_PROCHOT_AGENT).CODE(),
9748-
EVENT_RING_HOT , 1 },
9777+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_PROCHOT_STS).CODE(),
9778+
EVENT_RING_HOT_STS , 0 },
9779+
/* PROCHOT# Agent Log */
9780+
{ {BOXKEY_CLR_RING_HOT} , RSC(BOX_EVENT_PROCHOT_LOG).CODE(),
9781+
EVENT_RING_HOT_LOG , 1 },
97499782
/* Thermal Log */
97509783
{ {BOXKEY_CLR_RING_THM} , RSC(BOX_EVENT_THERMAL_LOG).CODE(),
9751-
EVENT_RING_THM , 1 },
9784+
EVENT_RING_THM_LOG , 1 },
97529785
/* Package PL1 */
97539786
{ {BOXKEY_CLR_RING_PL1} , RSC(BOX_EVENT_POWER_PL1).CODE(),
97549787
EVENT_RING_PL1 , 2 },
@@ -9759,20 +9792,27 @@ Window *CreateEvents(unsigned long long id)
97599792
{ {BOXKEY_CLR_RING_EDP} , RSC(BOX_EVENT_ELECTRICAL).CODE(),
97609793
EVENT_RING_EDP , 2 },
97619794
/* Blank cell */
9795+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9796+
EVENT_THERM_NONE , 0 },
9797+
/* Blank cell */
9798+
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
9799+
EVENT_THERM_NONE , 0 },
9800+
/* Blank cell */
97629801
{ {SCANKEY_NULL} , RSC(BOX_EVENT_SPACE).CODE(),
97639802
EVENT_THERM_NONE , 0 }
97649803
}
97659804
};
97669805
const size_t nmemb = sizeof(evLdr) / sizeof(struct EVENT_LDR_ST);
97679806

97689807
Window *wEvent = CreateWindow( wLayer, id,
9769-
4, nmemb / 4, 6, TOP_HEADER_ROW + 2 );
9808+
EVENT_DOMAINS, nmemb / EVENT_DOMAINS,
9809+
6, TOP_HEADER_ROW + 2 );
97709810
if (wEvent != NULL)
97719811
{
97729812
DATA_TYPE data;
97739813
CUINT col, row;
9774-
for (row = 0; row < 7; row++) {
9775-
for (col = 0; col < 4; col++) {
9814+
for (row = 0; row < EVENT_SECTIONS; row++) {
9815+
for (col = 0; col < EVENT_DOMAINS; col++) {
97769816
const unsigned short theme = ProcessorEvents & evLdr[col][row].mask ?
97779817
evLdr[col][row].theme : 0;
97789818

@@ -9815,6 +9855,9 @@ Window *CreateEvents(unsigned long long id)
98159855
return wEvent;
98169856
}
98179857

9858+
#undef EVENT_DOMAINS
9859+
#undef EVENT_SECTIONS
9860+
98189861
Window *CreateRecorder(unsigned long long id)
98199862
{
98209863
Window *wRec = CreateWindow( wLayer, id,
@@ -13393,7 +13436,7 @@ int Shortcut(SCANKEY *scan)
1339313436
break;
1339413437

1339513438
case BOXKEY_CLR_THM_SENSOR:
13396-
case BOXKEY_CLR_THM_PROCHOT:
13439+
case BOXKEY_CLR_PROCHOT_LOG:
1339713440
case BOXKEY_CLR_THM_CRIT:
1339813441
case BOXKEY_CLR_THM_THOLD:
1339913442
case BOXKEY_CLR_PWR_LIMIT:

‎corefreq-cli.h

+20-20
Original file line numberDiff line numberDiff line change
@@ -286,25 +286,25 @@ enum KEY_ENUM {
286286
BOXKEY_LIMIT_IDLE_ST10 = 0x30000000000148a1LLU,
287287

288288
BOXKEY_CLR_THM_SENSOR = BOXKEY_EVT_OR | (LSHIFT_THERM_SENSOR << 2),
289-
BOXKEY_CLR_THM_PROCHOT = BOXKEY_EVT_OR | (LSHIFT_THERM_PROCHOT << 2),
290-
BOXKEY_CLR_THM_CRIT = BOXKEY_EVT_OR | (LSHIFT_THERM_CRIT << 2),
289+
BOXKEY_CLR_PROCHOT_LOG = BOXKEY_EVT_OR | (LSHIFT_PROCHOT_LOG << 2),
290+
BOXKEY_CLR_THM_CRIT = BOXKEY_EVT_OR | (LSHIFT_CRITIC_LOG << 2),
291291
BOXKEY_CLR_THM_THOLD = BOXKEY_EVT_OR | (LSHIFT_THERM_THOLD << 2),
292292
BOXKEY_CLR_PWR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_POWER_LIMIT << 2),
293293
BOXKEY_CLR_CUR_LIMIT = BOXKEY_EVT_OR | (LSHIFT_CURRENT_LIMIT << 2),
294294
BOXKEY_CLR_X_DOMAIN = BOXKEY_EVT_OR | (LSHIFT_CROSS_DOMAIN << 2),
295-
BOXKEY_CLR_CORE_HOT = BOXKEY_EVT_OR | (LSHIFT_CORE_HOT << 2),
296-
BOXKEY_CLR_CORE_THM = BOXKEY_EVT_OR | (LSHIFT_CORE_THM << 2),
295+
BOXKEY_CLR_CORE_HOT = BOXKEY_EVT_OR | (LSHIFT_CORE_HOT_LOG << 2),
296+
BOXKEY_CLR_CORE_THM = BOXKEY_EVT_OR | (LSHIFT_CORE_THM_LOG << 2),
297297
BOXKEY_CLR_CORE_PL1 = BOXKEY_EVT_OR | (LSHIFT_CORE_PL1 << 2),
298298
BOXKEY_CLR_CORE_PL2 = BOXKEY_EVT_OR | (LSHIFT_CORE_PL2 << 2),
299299
BOXKEY_CLR_CORE_EDP = BOXKEY_EVT_OR | (LSHIFT_CORE_EDP << 2),
300300
BOXKEY_CLR_CORE_TURBO = BOXKEY_EVT_OR | (LSHIFT_CORE_TURBO << 2),
301-
BOXKEY_CLR_GFX_HOT = BOXKEY_EVT_OR | (LSHIFT_GFX_HOT << 2),
302-
BOXKEY_CLR_GFX_THM = BOXKEY_EVT_OR | (LSHIFT_GFX_THM << 2),
301+
BOXKEY_CLR_GFX_HOT = BOXKEY_EVT_OR | (LSHIFT_GFX_HOT_LOG << 2),
302+
BOXKEY_CLR_GFX_THM = BOXKEY_EVT_OR | (LSHIFT_GFX_THM_LOG << 2),
303303
BOXKEY_CLR_GFX_PL1 = BOXKEY_EVT_OR | (LSHIFT_GFX_PL1 << 2),
304304
BOXKEY_CLR_GFX_PL2 = BOXKEY_EVT_OR | (LSHIFT_GFX_PL2 << 2),
305305
BOXKEY_CLR_GFX_EDP = BOXKEY_EVT_OR | (LSHIFT_GFX_EDP << 2),
306-
BOXKEY_CLR_RING_HOT = BOXKEY_EVT_OR | (LSHIFT_RING_HOT << 2),
307-
BOXKEY_CLR_RING_THM = BOXKEY_EVT_OR | (LSHIFT_RING_THM << 2),
306+
BOXKEY_CLR_RING_HOT = BOXKEY_EVT_OR | (LSHIFT_RING_HOT_LOG << 2),
307+
BOXKEY_CLR_RING_THM = BOXKEY_EVT_OR | (LSHIFT_RING_THM_LOG << 2),
308308
BOXKEY_CLR_RING_PL1 = BOXKEY_EVT_OR | (LSHIFT_RING_PL1 << 2),
309309
BOXKEY_CLR_RING_PL2 = BOXKEY_EVT_OR | (LSHIFT_RING_PL2 << 2),
310310
BOXKEY_CLR_RING_EDP = BOXKEY_EVT_OR | (LSHIFT_RING_EDP << 2),
@@ -628,7 +628,7 @@ int CheckDuplicateKey(void) \
628628
case BOXKEY_LIMIT_IDLE_ST10: \
629629
\
630630
case BOXKEY_CLR_THM_SENSOR: \
631-
case BOXKEY_CLR_THM_PROCHOT: \
631+
case BOXKEY_CLR_PROCHOT_LOG: \
632632
case BOXKEY_CLR_THM_CRIT: \
633633
case BOXKEY_CLR_THM_THOLD: \
634634
case BOXKEY_CLR_PWR_LIMIT: \
@@ -944,18 +944,18 @@ struct RECORDER_ST {
944944

945945
#define HOT_EVENT_FILTER ( ALL_EVENT_MASK \
946946
& ( EVENT_THERM_SENSOR \
947-
| EVENT_THERM_PROCHOT \
948-
| EVENT_THERM_CRIT \
949-
| EVENT_THERM_THOLD \
950-
| EVENT_CORE_STS \
951-
| EVENT_CORE_HOT \
952-
| EVENT_GFX_STS \
953-
| EVENT_GFX_HOT \
954-
| EVENT_RING_STS \
955-
| EVENT_RING_HOT ) )
947+
| EVENT_PROCHOT_LOG \
948+
| EVENT_CRITIC_LOG \
949+
| EVENT_THRESHOLD_LOG \
950+
| EVENT_CORE_THM_STS \
951+
| EVENT_CORE_HOT_STS \
952+
| EVENT_GFX_THM_STS \
953+
| EVENT_GFX_HOT_STS \
954+
| EVENT_RING_THM_STS \
955+
| EVENT_RING_HOT_STS ) )
956956

957957
#define THERMAL_EVENT_FILTER ( ALL_EVENT_MASK \
958958
& ( EVENT_THERM_SENSOR \
959-
| EVENT_THERM_PROCHOT \
960-
| EVENT_THERM_CRIT \
959+
| EVENT_PROCHOT_STS \
960+
| EVENT_CRITIC_TMP \
961961
| EVENT_THERM_THOLD ) )

0 commit comments

Comments
 (0)