zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Introduce spaceship comparison for Processes

Browse Source 
If currently two unsigned values are compared via `a - b`, in the case b
is actually bigger than a, the result will not be an negative number (as
-1 is expected) but a huge positive number as the subtraction is an
unsigned subtraction.

Avoid over-/underflow affected operations; use comparisons.
Modern compilers will generate sane code, like:
    xor     eax, eax
    cmp     rdi, rsi
    seta    al
    sbb     eax, 0
    ret
This commit is contained in:
Christian Göttsche
2020-11-04 17:46:24 +01:00
committed by BenBE
parent d785b1bbc3
commit 397b5c4bd0
7 changed files with 111 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
solaris/SolarisProcess.c
View File

@ -119,6 +119,7 @@ void SolarisProcess_writeField(const Process* this, RichString* str, ProcessFiel
long SolarisProcess_compare(const void* v1, const void* v2) {
const SolarisProcess *p1, *p2;
const Settings* settings = ((const Process*)v1)->settings;
if (settings->direction == 1) {
p1 = (const SolarisProcess*)v1;
p2 = (const SolarisProcess*)v2;
@ -126,25 +127,26 @@ long SolarisProcess_compare(const void* v1, const void* v2) {
p2 = (const SolarisProcess*)v1;
p1 = (const SolarisProcess*)v2;
}
switch ((int) settings->sortKey) {
case ZONEID:
return (p1->zoneid - p2->zoneid);
return SPACESHIP_NUMBER(p1->zoneid, p2->zoneid);
case PROJID:
return (p1->projid - p2->projid);
return SPACESHIP_NUMBER(p1->projid, p2->projid);
case TASKID:
return (p1->taskid - p2->taskid);
return SPACESHIP_NUMBER(p1->taskid, p2->taskid);
case POOLID:
return (p1->poolid - p2->poolid);
return SPACESHIP_NUMBER(p1->poolid, p2->poolid);
case CONTID:
return (p1->contid - p2->contid);
return SPACESHIP_NUMBER(p1->contid, p2->contid);
case ZONE:
return strcmp(p1->zname ? p1->zname : "global", p2->zname ? p2->zname : "global");
case PID:
return (p1->realpid - p2->realpid);
return SPACESHIP_NUMBER(p1->realpid, p2->realpid);
case PPID:
return (p1->realppid - p2->realppid);
return SPACESHIP_NUMBER(p1->realppid, p2->realppid);
case LWPID:
return (p1->lwpid - p2->lwpid);
return SPACESHIP_NUMBER(p1->lwpid, p2->lwpid);
default:
return Process_compare(v1, v2);
}