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

Remove Linux-specific cpp conditional in SwapMeter.c 

Instead use the common NAN pattern to use of the swap
cached value on platforms that do not support it.
This commit is contained in:
Nathan Scott 2021-07-07 14:24:32 +10:00
parent 15a71f32fe
commit 149774209b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SwapMeter.c
View File

@ -9,6 +9,7 @@ in the source distribution for its full text.
#include "SwapMeter.h" #include "SwapMeter.h"
#include <math.h>
#include <stddef.h> #include <stddef.h>
#include "CRT.h" #include "CRT.h"
@ -26,6 +27,8 @@ static void SwapMeter_updateValues(Meter* this) {
char* buffer = this->txtBuffer; char* buffer = this->txtBuffer;
size_t size = sizeof(this->txtBuffer); size_t size = sizeof(this->txtBuffer);
int written; int written;
this->values[1] = NAN; /* 'cached' not present on all platforms */
Platform_setSwapValues(this); Platform_setSwapValues(this);
written = Meter_humanUnit(buffer, this->values[0], size); written = Meter_humanUnit(buffer, this->values[0], size);
@ -46,11 +49,11 @@ static void SwapMeter_display(const Object* cast, RichString* out) {
RichString_appendAscii(out, CRT_colors[METER_TEXT], " used:"); RichString_appendAscii(out, CRT_colors[METER_TEXT], " used:");
RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer); RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
#ifdef HTOP_LINUX if (!isnan(this->values[1])) {
Meter_humanUnit(buffer, this->values[1], sizeof(buffer)); Meter_humanUnit(buffer, this->values[1], sizeof(buffer));
RichString_appendAscii(out, CRT_colors[METER_TEXT], " cache:"); RichString_appendAscii(out, CRT_colors[METER_TEXT], " cache:");
RichString_appendAscii(out, CRT_colors[SWAP_CACHE], buffer); RichString_appendAscii(out, CRT_colors[SWAP_CACHE], buffer);
#endif }
} }
const MeterClass SwapMeter_class = { const MeterClass SwapMeter_class = {