diff options
Diffstat (limited to 'MemoryMeter.c')
-rw-r--r-- | MemoryMeter.c | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/MemoryMeter.c b/MemoryMeter.c index e475442..75ad7e8 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -7,6 +7,9 @@ in the source distribution for its full text. #include "MemoryMeter.h" +#include <math.h> +#include <stddef.h> + #include "CRT.h" #include "Object.h" #include "Platform.h" @@ -16,14 +19,24 @@ in the source distribution for its full text. static const int MemoryMeter_attributes[] = { MEMORY_USED, MEMORY_BUFFERS, + MEMORY_SHARED, MEMORY_CACHE }; -static void MemoryMeter_updateValues(Meter* this, char* buffer, size_t size) { +static void MemoryMeter_updateValues(Meter* this) { + char* buffer = this->txtBuffer; + size_t size = sizeof(this->txtBuffer); int written; + + /* shared and available memory are not supported on all platforms */ + this->values[2] = NAN; + this->values[4] = NAN; Platform_setMemoryValues(this); - written = Meter_humanUnit(buffer, this->values[0], size); + /* Do not print available memory in bar mode */ + this->curItems = 4; + + written = Meter_humanUnit(buffer, isnan(this->values[4]) ? this->values[0] : this->total - this->values[4], size); METER_BUFFER_CHECK(buffer, size, written); METER_BUFFER_APPEND_CHR(buffer, size, '/'); @@ -34,18 +47,36 @@ static void MemoryMeter_updateValues(Meter* this, char* buffer, size_t size) { static void MemoryMeter_display(const Object* cast, RichString* out) { char buffer[50]; const Meter* this = (const Meter*)cast; + RichString_writeAscii(out, CRT_colors[METER_TEXT], ":"); Meter_humanUnit(buffer, this->total, sizeof(buffer)); RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer); + Meter_humanUnit(buffer, this->values[0], sizeof(buffer)); RichString_appendAscii(out, CRT_colors[METER_TEXT], " used:"); RichString_appendAscii(out, CRT_colors[MEMORY_USED], buffer); + Meter_humanUnit(buffer, this->values[1], sizeof(buffer)); RichString_appendAscii(out, CRT_colors[METER_TEXT], " buffers:"); RichString_appendAscii(out, CRT_colors[MEMORY_BUFFERS_TEXT], buffer); - Meter_humanUnit(buffer, this->values[2], sizeof(buffer)); + + /* shared memory is not supported on all platforms */ + if (!isnan(this->values[2])) { + Meter_humanUnit(buffer, this->values[2], sizeof(buffer)); + RichString_appendAscii(out, CRT_colors[METER_TEXT], " shared:"); + RichString_appendAscii(out, CRT_colors[MEMORY_SHARED], buffer); + } + + Meter_humanUnit(buffer, this->values[3], sizeof(buffer)); RichString_appendAscii(out, CRT_colors[METER_TEXT], " cache:"); RichString_appendAscii(out, CRT_colors[MEMORY_CACHE], buffer); + + /* available memory is not supported on all platforms */ + if (!isnan(this->values[4])) { + Meter_humanUnit(buffer, this->values[4], sizeof(buffer)); + RichString_appendAscii(out, CRT_colors[METER_TEXT], " available:"); + RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer); + } } const MeterClass MemoryMeter_class = { @@ -56,7 +87,7 @@ const MeterClass MemoryMeter_class = { }, .updateValues = MemoryMeter_updateValues, .defaultMode = BAR_METERMODE, - .maxItems = 3, + .maxItems = 5, .total = 100.0, .attributes = MemoryMeter_attributes, .name = "Memory", |