zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PressureStallMeter: improve display strings 

- Shorten name for header setup menu
- Improve caption in bar mode
This commit is contained in:
Christian Göttsche 2020-11-29 15:27:51 +01:00 committed by BenBE
parent 472f0124cd
commit 1d8192c10b
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
linux/PressureStallMeter.c
View File

@ -20,7 +20,9 @@ in the source distribution for its full text.
static const int PressureStallMeter_attributes[] = { static const int PressureStallMeter_attributes[] = {
PRESSURE_STALL_TEN, PRESSURE_STALL_SIXTY, PRESSURE_STALL_THREEHUNDRED PRESSURE_STALL_TEN,
PRESSURE_STALL_SIXTY,
PRESSURE_STALL_THREEHUNDRED
}; };
static void PressureStallMeter_updateValues(Meter* this, char* buffer, int len) { static void PressureStallMeter_updateValues(Meter* this, char* buffer, int len) {
@ -41,7 +43,7 @@ static void PressureStallMeter_updateValues(Meter* this, char* buffer, int len)
} }
Platform_getPressureStall(file, some, &this->values[0], &this->values[1], &this->values[2]); Platform_getPressureStall(file, some, &this->values[0], &this->values[1], &this->values[2]);
xSnprintf(buffer, len, "xxxx %.2lf%% %.2lf%% %.2lf%%", this->values[0], this->values[1], this->values[2]); xSnprintf(buffer, len, "%s %s %.2lf%% %.2lf%% %.2lf%%", some ? "some" : "full", file, this->values[0], this->values[1], this->values[2]);
} }
static void PressureStallMeter_display(const Object* cast, RichString* out) { static void PressureStallMeter_display(const Object* cast, RichString* out) {
@ -67,8 +69,9 @@ const MeterClass PressureStallCPUSomeMeter_class = {
.total = 100.0, .total = 100.0,
.attributes = PressureStallMeter_attributes, .attributes = PressureStallMeter_attributes,
.name = "PressureStallCPUSome", .name = "PressureStallCPUSome",
.uiName = "Pressure Stall Information, some CPU", .uiName = "PSI some CPU",
.caption = "Some CPU pressure: " .caption = "PSI some CPU: ",
.description = "Pressure Stall Information, some cpu"
}; };
const MeterClass PressureStallIOSomeMeter_class = { const MeterClass PressureStallIOSomeMeter_class = {
@ -83,8 +86,9 @@ const MeterClass PressureStallIOSomeMeter_class = {
.total = 100.0, .total = 100.0,
.attributes = PressureStallMeter_attributes, .attributes = PressureStallMeter_attributes,
.name = "PressureStallIOSome", .name = "PressureStallIOSome",
.uiName = "Pressure Stall Information, some IO", .uiName = "PSI some IO",
.caption = "Some IO pressure: " .caption = "PSI some IO: ",
.description = "Pressure Stall Information, some io"
}; };
const MeterClass PressureStallIOFullMeter_class = { const MeterClass PressureStallIOFullMeter_class = {
@ -99,8 +103,9 @@ const MeterClass PressureStallIOFullMeter_class = {
.total = 100.0, .total = 100.0,
.attributes = PressureStallMeter_attributes, .attributes = PressureStallMeter_attributes,
.name = "PressureStallIOFull", .name = "PressureStallIOFull",
.uiName = "Pressure Stall Information, full IO", .uiName = "PSI full IO",
.caption = "Full IO pressure: " .caption = "PSI full IO: ",
.description = "Pressure Stall Information, full io"
}; };
const MeterClass PressureStallMemorySomeMeter_class = { const MeterClass PressureStallMemorySomeMeter_class = {
@ -115,8 +120,9 @@ const MeterClass PressureStallMemorySomeMeter_class = {
.total = 100.0, .total = 100.0,
.attributes = PressureStallMeter_attributes, .attributes = PressureStallMeter_attributes,
.name = "PressureStallMemorySome", .name = "PressureStallMemorySome",
.uiName = "Pressure Stall Information, some memory", .uiName = "PSI some memory",
.caption = "Some Mem pressure: " .caption = "PSI some memory: ",
.description = "Pressure Stall Information, some memory"
}; };
const MeterClass PressureStallMemoryFullMeter_class = { const MeterClass PressureStallMemoryFullMeter_class = {
@ -131,6 +137,7 @@ const MeterClass PressureStallMemoryFullMeter_class = {
.total = 100.0, .total = 100.0,
.attributes = PressureStallMeter_attributes, .attributes = PressureStallMeter_attributes,
.name = "PressureStallMemoryFull", .name = "PressureStallMemoryFull",
.uiName = "Pressure Stall Information, full memory", .uiName = "PSI full memory",
.caption = "Full Mem pressure: " .caption = "PSI full memory: ",
.description = "Pressure Stall Information, full memory"
}; };