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

Update IO rate display to use NAN on error

This commit is contained in:
Benny Baumann 2020-09-07 11:53:58 +02:00 committed by cgzones
parent 47e2cefe02
commit 29ec115143
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Process.c
View File

@ -219,7 +219,7 @@ void Process_outputRate(RichString* str, char* buffer, int n, double rate, int c
largeNumberColor = CRT_colors[PROCESS]; largeNumberColor = CRT_colors[PROCESS];
processMegabytesColor = CRT_colors[PROCESS]; processMegabytesColor = CRT_colors[PROCESS];
} }
if (rate == -1) { if (isnan(rate)) {
int len = snprintf(buffer, n, " no perm "); int len = snprintf(buffer, n, " no perm ");
RichString_appendn(str, CRT_colors[PROCESS_SHADOW], buffer, len); RichString_appendn(str, CRT_colors[PROCESS_SHADOW], buffer, len);
} else if (rate < ONE_K) { } else if (rate < ONE_K) {

13
linux/LinuxProcess.c
View File

@ -17,6 +17,7 @@ in the source distribution for its full text.
#include <string.h> #include <string.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <time.h> #include <time.h>
#include <math.h>
/* semi-global */ /* semi-global */
long long btime; long long btime;
@ -237,9 +238,15 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field)
case IO_READ_RATE: Process_outputRate(str, buffer, n, lp->io_rate_read_bps, coloring); return; case IO_READ_RATE: Process_outputRate(str, buffer, n, lp->io_rate_read_bps, coloring); return;
case IO_WRITE_RATE: Process_outputRate(str, buffer, n, lp->io_rate_write_bps, coloring); return; case IO_WRITE_RATE: Process_outputRate(str, buffer, n, lp->io_rate_write_bps, coloring); return;
case IO_RATE: { case IO_RATE: {
double totalRate = (lp->io_rate_read_bps != -1) double totalRate = NAN;
? (lp->io_rate_read_bps + lp->io_rate_write_bps) if(!isnan(lp->io_rate_read_bps) && !isnan(lp->io_rate_write_bps))
: -1; totalRate = lp->io_rate_read_bps + lp->io_rate_write_bps;
else if(!isnan(lp->io_rate_read_bps))
totalRate = lp->io_rate_read_bps;
else if(!isnan(lp->io_rate_write_bps))
totalRate = lp->io_rate_write_bps;
else
totalRate = NAN;
Process_outputRate(str, buffer, n, totalRate, coloring); return; Process_outputRate(str, buffer, n, totalRate, coloring); return;
} }
#endif #endif

4
linux/LinuxProcessList.c
View File

@ -331,8 +331,8 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna
xSnprintf(filename, MAX_NAME, "%s/%s/io", dirname, name); xSnprintf(filename, MAX_NAME, "%s/%s/io", dirname, name);
int fd = open(filename, O_RDONLY); int fd = open(filename, O_RDONLY);
if (fd == -1) { if (fd == -1) {
process->io_rate_read_bps = -1; process->io_rate_read_bps = NAN;
process->io_rate_write_bps = -1; process->io_rate_write_bps = NAN;
process->io_rchar = -1LL; process->io_rchar = -1LL;
process->io_wchar = -1LL; process->io_wchar = -1LL;
process->io_syscr = -1LL; process->io_syscr = -1LL;