summaryrefslogtreecommitdiffstats
path: root/solaris
diff options
context:
space:
mode:
authorChristian Göttsche <cgzones@googlemail.com>2020-11-04 17:46:24 +0100
committerBenBE <BenBE@geshi.org>2020-11-15 18:25:21 +0100
commit397b5c4bd09115d0df0846fee1b06797b68ae11c (patch)
treec0680d6e463d6325f87e67ef12d88dc2bd805812 /solaris
parentd785b1bbc3e30e41bacd283712455090eb2fe99c (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 'solaris')
-rw-r--r--solaris/SolarisProcess.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c
index 9c6c7d77..7d833fe9 100644
--- a/solaris/SolarisProcess.c
+++ b/solaris/SolarisProcess.c
@@ -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);
}

© 2014-2024 Faster IT GmbH | imprint | privacy policy