From 6f58fbc5dd091557129895bbd0a05335e411d19e Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 12 Jun 2015 09:50:55 +0200 Subject: [PATCH 1/2] make units more dynamic Signed-off-by: Christian Hesse --- MemoryMeter.c | 10 +++++++++- Meter.c | 28 ++++++++++++++++++++++++++++ Meter.h | 2 ++ SwapMeter.c | 12 ++++++++++-- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/MemoryMeter.c b/MemoryMeter.c index f1c1e357..ba9dcc9c 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -25,8 +25,16 @@ int MemoryMeter_attributes[] = { }; static void MemoryMeter_setValues(Meter* this, char* buffer, int size) { + int written; Platform_setMemoryValues(this); - snprintf(buffer, size, "%ld/%ldM", (long int) this->values[0] / 1024, (long int) this->total / 1024); + + written = Meter_humanUnit(buffer, this->values[0], size); + buffer += written; + if ((size -= written) > 0) { + *buffer++ = '/'; + size--; + Meter_humanUnit(buffer, this->total, size); + } } static void MemoryMeter_display(Object* cast, RichString* out) { diff --git a/Meter.c b/Meter.c index cc661e6a..732203f9 100644 --- a/Meter.c +++ b/Meter.c @@ -141,6 +141,34 @@ Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type) { return this; } +int Meter_humanUnit(char* buffer, unsigned long int value, int size) { + const char * prefix = "KMGTPEZY"; + unsigned long int powi = 1; + unsigned int written, powj = 1, precision = 2; + + for(;;) { + if (value / 1024 < powi) + break; + + if (prefix[1] == 0) + break; + + powi *= 1024; + ++prefix; + } + + for (; precision > 0; precision--) { + powj *= 10; + if (value / powi < powj) + break; + } + + written = snprintf(buffer, size, "%.*f%c", + precision, (double) value / powi, *prefix); + + return written; +} + void Meter_delete(Object* cast) { if (!cast) return; diff --git a/Meter.h b/Meter.h index 6b268c3f..fe102fb3 100644 --- a/Meter.h +++ b/Meter.h @@ -105,6 +105,8 @@ extern MeterClass Meter_class; Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type); +int Meter_humanUnit(char* buffer, unsigned long int value, int size); + void Meter_delete(Object* cast); void Meter_setCaption(Meter* this, const char* caption); diff --git a/SwapMeter.c b/SwapMeter.c index a19c0300..aaa5e93c 100644 --- a/SwapMeter.c +++ b/SwapMeter.c @@ -33,9 +33,17 @@ static void SwapMeter_humanNumber(char* buffer, const long int* value) { sprintf(buffer, "%ldM ", *value / MEGABYTE); } -static void SwapMeter_setValues(Meter* this, char* buffer, int len) { +static void SwapMeter_setValues(Meter* this, char* buffer, int size) { + int written; Platform_setSwapValues(this); - snprintf(buffer, len, "%ld/%ldM", (long int) this->values[0] / MEGABYTE, (long int) this->total / MEGABYTE); + + written = Meter_humanUnit(buffer, this->values[0], size); + buffer += written; + if ((size -= written) > 0) { + *buffer++ = '/'; + size--; + Meter_humanUnit(buffer, this->total, size); + } } static void SwapMeter_display(Object* cast, RichString* out) { From cf47f4fca1bab93b81a2fb32cb548cb1722bb0f4 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 12 Jun 2015 09:53:18 +0200 Subject: [PATCH 2/2] use dynamic units for text display Signed-off-by: Christian Hesse --- MemoryMeter.c | 19 +++++++------------ SwapMeter.c | 17 +++-------------- SwapMeter.h | 5 ----- 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/MemoryMeter.c b/MemoryMeter.c index ba9dcc9c..dae56b5e 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -40,22 +40,17 @@ static void MemoryMeter_setValues(Meter* this, char* buffer, int size) { static void MemoryMeter_display(Object* cast, RichString* out) { char buffer[50]; Meter* this = (Meter*)cast; - int k = 1024; const char* format = "%ldM "; - long int totalMem = this->total / k; - long int usedMem = this->values[0] / k; - long int buffersMem = this->values[1] / k; - long int cachedMem = this->values[2] / k; RichString_write(out, CRT_colors[METER_TEXT], ":"); - sprintf(buffer, format, totalMem); + Meter_humanUnit(buffer, this->total, 50); RichString_append(out, CRT_colors[METER_VALUE], buffer); - sprintf(buffer, format, usedMem); - RichString_append(out, CRT_colors[METER_TEXT], "used:"); + Meter_humanUnit(buffer, this->values[0], 50); + RichString_append(out, CRT_colors[METER_TEXT], " used:"); RichString_append(out, CRT_colors[MEMORY_USED], buffer); - sprintf(buffer, format, buffersMem); - RichString_append(out, CRT_colors[METER_TEXT], "buffers:"); + Meter_humanUnit(buffer, this->values[1], 50); + RichString_append(out, CRT_colors[METER_TEXT], " buffers:"); RichString_append(out, CRT_colors[MEMORY_BUFFERS_TEXT], buffer); - sprintf(buffer, format, cachedMem); - RichString_append(out, CRT_colors[METER_TEXT], "cache:"); + Meter_humanUnit(buffer, this->values[2], 50); + RichString_append(out, CRT_colors[METER_TEXT], " cache:"); RichString_append(out, CRT_colors[MEMORY_CACHE], buffer); } diff --git a/SwapMeter.c b/SwapMeter.c index aaa5e93c..895ca0be 100644 --- a/SwapMeter.c +++ b/SwapMeter.c @@ -20,19 +20,10 @@ in the source distribution for its full text. #include "Meter.h" }*/ -#define KILOBYTE 1 -#define MEGABYTE 1024 -#define GIGABYTE 1048576 - int SwapMeter_attributes[] = { SWAP }; -/* NOTE: Value is in kilobytes */ -static void SwapMeter_humanNumber(char* buffer, const long int* value) { - sprintf(buffer, "%ldM ", *value / MEGABYTE); -} - static void SwapMeter_setValues(Meter* this, char* buffer, int size) { int written; Platform_setSwapValues(this); @@ -49,13 +40,11 @@ static void SwapMeter_setValues(Meter* this, char* buffer, int size) { static void SwapMeter_display(Object* cast, RichString* out) { char buffer[50]; Meter* this = (Meter*)cast; - long int swap = (long int) this->values[0]; - long int total = (long int) this->total; RichString_write(out, CRT_colors[METER_TEXT], ":"); - SwapMeter_humanNumber(buffer, &total); + Meter_humanUnit(buffer, this->total, 50); RichString_append(out, CRT_colors[METER_VALUE], buffer); - SwapMeter_humanNumber(buffer, &swap); - RichString_append(out, CRT_colors[METER_TEXT], "used:"); + Meter_humanUnit(buffer, this->values[0], 50); + RichString_append(out, CRT_colors[METER_TEXT], " used:"); RichString_append(out, CRT_colors[METER_VALUE], buffer); } diff --git a/SwapMeter.h b/SwapMeter.h index bb46a38c..2b57fe54 100644 --- a/SwapMeter.h +++ b/SwapMeter.h @@ -11,13 +11,8 @@ in the source distribution for its full text. #include "Meter.h" -#define KILOBYTE 1 -#define MEGABYTE 1024 -#define GIGABYTE 1048576 - extern int SwapMeter_attributes[]; -/* NOTE: Value is in kilobytes */ extern MeterClass SwapMeter_class; #endif