diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2020-11-04 17:46:24 +0100 |
---|---|---|
committer | BenBE <BenBE@geshi.org> | 2020-11-15 18:25:21 +0100 |
commit | 397b5c4bd09115d0df0846fee1b06797b68ae11c (patch) | |
tree | c0680d6e463d6325f87e67ef12d88dc2bd805812 /Process.c | |
parent | d785b1bbc3e30e41bacd283712455090eb2fe99c (diff) |
Introduce spaceship comparison for Processes
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
Diffstat (limited to 'Process.c')
-rw-r--r-- | Process.c | 59 |
1 files changed, 29 insertions, 30 deletions
@@ -460,6 +460,8 @@ long Process_pidCompare(const void* v1, const void* v2) { long Process_compare(const void* v1, const void* v2) { const Process *p1, *p2; const Settings *settings = ((const Process*)v1)->settings; + int r; + if (settings->direction == 1) { p1 = (const Process*)v1; p2 = (const Process*)v2; @@ -467,59 +469,56 @@ long Process_compare(const void* v1, const void* v2) { p2 = (const Process*)v1; p1 = (const Process*)v2; } + switch (settings->sortKey) { case PERCENT_CPU: - return (p2->percent_cpu > p1->percent_cpu ? 1 : -1); + return SPACESHIP_NUMBER(p2->percent_cpu, p1->percent_cpu); case PERCENT_MEM: - return (p2->m_resident - p1->m_resident); + return SPACESHIP_NUMBER(p2->m_resident, p1->m_resident); case COMM: - return strcmp(p1->comm, p2->comm); + return SPACESHIP_NULLSTR(p1->comm, p2->comm); case MAJFLT: - return (p2->majflt - p1->majflt); + return SPACESHIP_NUMBER(p2->majflt, p1->majflt); case MINFLT: - return (p2->minflt - p1->minflt); + return SPACESHIP_NUMBER(p2->minflt, p1->minflt); case M_RESIDENT: - return (p2->m_resident - p1->m_resident); + return SPACESHIP_NUMBER(p2->m_resident, p1->m_resident); case M_SIZE: - return (p2->m_size - p1->m_size); + return SPACESHIP_NUMBER(p2->m_size, p1->m_size); case NICE: - return (p1->nice - p2->nice); + return SPACESHIP_NUMBER(p1->nice, p2->nice); case NLWP: - return (p1->nlwp - p2->nlwp); + return SPACESHIP_NUMBER(p1->nlwp, p2->nlwp); case PGRP: - return (p1->pgrp - p2->pgrp); + return SPACESHIP_NUMBER(p1->pgrp, p2->pgrp); case PID: - return (p1->pid - p2->pid); + return SPACESHIP_NUMBER(p1->pid, p2->pid); case PPID: - return (p1->ppid - p2->ppid); + return SPACESHIP_NUMBER(p1->ppid, p2->ppid); case PRIORITY: - return (p1->priority - p2->priority); + return SPACESHIP_NUMBER(p1->priority, p2->priority); case PROCESSOR: - return (p1->processor - p2->processor); + return SPACESHIP_NUMBER(p1->processor, p2->processor); case SESSION: - return (p1->session - p2->session); - case STARTTIME: { - if (p1->starttime_ctime == p2->starttime_ctime) { - return (p1->pid - p2->pid); - } else { - return (p1->starttime_ctime - p2->starttime_ctime); - } - } + return SPACESHIP_NUMBER(p1->session, p2->session); + case STARTTIME: + r = SPACESHIP_NUMBER(p1->starttime_ctime, p2->starttime_ctime); + return r != 0 ? r : SPACESHIP_NUMBER(p1->pid, p2->pid); case STATE: - return (Process_sortState(p1->state) - Process_sortState(p2->state)); + return SPACESHIP_NUMBER(Process_sortState(p1->state), Process_sortState(p2->state)); case ST_UID: - return (p1->st_uid - p2->st_uid); + return SPACESHIP_NUMBER(p1->st_uid, p2->st_uid); case TIME: - return ((p2->time) - (p1->time)); + return SPACESHIP_NUMBER(p2->time, p1->time); case TGID: - return (p1->tgid - p2->tgid); + return SPACESHIP_NUMBER(p1->tgid, p2->tgid); case TPGID: - return (p1->tpgid - p2->tpgid); + return SPACESHIP_NUMBER(p1->tpgid, p2->tpgid); case TTY_NR: - return (p1->tty_nr - p2->tty_nr); + return SPACESHIP_NUMBER(p1->tty_nr, p2->tty_nr); case USER: - return strcmp(p1->user ? p1->user : "", p2->user ? p2->user : ""); + return SPACESHIP_NULLSTR(p1->user, p2->user); default: - return (p1->pid - p2->pid); + return SPACESHIP_NUMBER(p1->pid, p2->pid); } } |