New upstream version 3.0.3upstream/3.0.3

1 files changed, 51 insertions, 41 deletions

diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c
index 56055bf..745068c 100644
--- a/linux/PressureStallMeter.c
+++ b/linux/PressureStallMeter.c
@@ -2,47 +2,52 @@
 htop - PressureStallMeter.c
 (C) 2004-2011 Hisham H. Muhammad
 (C) 2019 Ran Benita
-Released under the GNU GPL, see the COPYING file
+Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
 #include "PressureStallMeter.h"
-#include "Platform.h"
-#include "CRT.h"
 
+#include <stdbool.h>
 #include <string.h>
 
-/*{
+#include "CRT.h"
 #include "Meter.h"
-}*/
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+
 
-static int PressureStallMeter_attributes[] = {
-   PRESSURE_STALL_TEN, PRESSURE_STALL_SIXTY, PRESSURE_STALL_THREEHUNDRED
+static const int PressureStallMeter_attributes[] = {
+   PRESSURE_STALL_TEN,
+   PRESSURE_STALL_SIXTY,
+   PRESSURE_STALL_THREEHUNDRED
 };
 
-static void PressureStallMeter_updateValues(Meter* this, char* buffer, int len) {
-    const char *file;
-    if (strstr(Meter_name(this), "CPU")) {
-       file = "cpu";
-    } else if (strstr(Meter_name(this), "IO")) {
-       file = "io";
-    } else {
-       file = "memory";
-    }
+static void PressureStallMeter_updateValues(Meter* this, char* buffer, size_t len) {
+   const char* file;
+   if (strstr(Meter_name(this), "CPU")) {
+      file = "cpu";
+   } else if (strstr(Meter_name(this), "IO")) {
+      file = "io";
+   } else {
+      file = "memory";
+   }
 
-    bool some;
-    if (strstr(Meter_name(this), "Some")) {
-       some = true;
-    } else {
-       some = false;
-    }
+   bool some;
+   if (strstr(Meter_name(this), "Some")) {
+      some = true;
+   } else {
+      some = false;
+   }
 
-    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]);
+   Platform_getPressureStall(file, some, &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(Object* cast, RichString* out) {
-   Meter* this = (Meter*)cast;
+static void PressureStallMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
    char buffer[20];
    xSnprintf(buffer, sizeof(buffer), "%.2lf%% ", this->values[0]);
    RichString_write(out, CRT_colors[PRESSURE_STALL_TEN], buffer);
@@ -52,7 +57,7 @@ static void PressureStallMeter_display(Object* cast, RichString* out) {
    RichString_append(out, CRT_colors[PRESSURE_STALL_THREEHUNDRED], buffer);
 }
 
-MeterClass PressureStallCPUSomeMeter_class = {
+const MeterClass PressureStallCPUSomeMeter_class = {
    .super = {
       .extends = Class(Meter),
       .delete = Meter_delete,
@@ -64,11 +69,12 @@ MeterClass PressureStallCPUSomeMeter_class = {
    .total = 100.0,
    .attributes = PressureStallMeter_attributes,
    .name = "PressureStallCPUSome",
-   .uiName = "Pressure Stall Information, some CPU",
-   .caption = "Some CPU pressure: "
+   .uiName = "PSI some CPU",
+   .caption = "PSI some CPU:    ",
+   .description = "Pressure Stall Information, some cpu"
 };
 
-MeterClass PressureStallIOSomeMeter_class = {
+const MeterClass PressureStallIOSomeMeter_class = {
    .super = {
       .extends = Class(Meter),
       .delete = Meter_delete,
@@ -80,11 +86,12 @@ MeterClass PressureStallIOSomeMeter_class = {
    .total = 100.0,
    .attributes = PressureStallMeter_attributes,
    .name = "PressureStallIOSome",
-   .uiName = "Pressure Stall Information, some IO",
-   .caption = "Some IO  pressure: "
+   .uiName = "PSI some IO",
+   .caption = "PSI some IO:     ",
+   .description = "Pressure Stall Information, some io"
 };
 
-MeterClass PressureStallIOFullMeter_class = {
+const MeterClass PressureStallIOFullMeter_class = {
    .super = {
       .extends = Class(Meter),
       .delete = Meter_delete,
@@ -96,11 +103,12 @@ MeterClass PressureStallIOFullMeter_class = {
    .total = 100.0,
    .attributes = PressureStallMeter_attributes,
    .name = "PressureStallIOFull",
-   .uiName = "Pressure Stall Information, full IO",
-   .caption = "Full IO  pressure: "
+   .uiName = "PSI full IO",
+   .caption = "PSI full IO:     ",
+   .description = "Pressure Stall Information, full io"
 };
 
-MeterClass PressureStallMemorySomeMeter_class = {
+const MeterClass PressureStallMemorySomeMeter_class = {
    .super = {
       .extends = Class(Meter),
       .delete = Meter_delete,
@@ -112,11 +120,12 @@ MeterClass PressureStallMemorySomeMeter_class = {
    .total = 100.0,
    .attributes = PressureStallMeter_attributes,
    .name = "PressureStallMemorySome",
-   .uiName = "Pressure Stall Information, some memory",
-   .caption = "Some Mem pressure: "
+   .uiName = "PSI some memory",
+   .caption = "PSI some memory: ",
+   .description = "Pressure Stall Information, some memory"
 };
 
-MeterClass PressureStallMemoryFullMeter_class = {
+const MeterClass PressureStallMemoryFullMeter_class = {
    .super = {
       .extends = Class(Meter),
       .delete = Meter_delete,
@@ -128,6 +137,7 @@ MeterClass PressureStallMemoryFullMeter_class = {
    .total = 100.0,
    .attributes = PressureStallMeter_attributes,
    .name = "PressureStallMemoryFull",
-   .uiName = "Pressure Stall Information, full memory",
-   .caption = "Full Mem pressure: "
+   .uiName = "PSI full memory",
+   .caption = "PSI full memory: ",
+   .description = "Pressure Stall Information, full memory"
 };