diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2020-12-17 20:09:55 -0300 |
---|---|---|
committer | BenBE <BenBE@geshi.org> | 2020-12-19 16:02:34 +0100 |
commit | 3d1703f16faf5bd3c73976909e1b6e03061a7f72 (patch) | |
tree | 45dbb3c0be0817b833b9d4a64376d9033b5ef2fe /freebsd | |
parent | 52fa4e7ee4816209ad82ba92ece8a3dc5b25ddd0 (diff) |
Invert Process_compare resolution so that superclass matches run first
* This removes duplicated code that adjusts the sort direction from every
OS-specific folder.
* Most fields in a regular htop screen are OS-independent, so trying
Process_compare first and only falling back to the OS-specific
compareByKey function if it's an OS-specific field makes sense.
* This will allow us to override the sortKey in a global way without having
to edit each OS-specific file.
Diffstat (limited to 'freebsd')
-rw-r--r-- | freebsd/FreeBSDProcess.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index 1c670ae3..cebf6908 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -108,19 +108,11 @@ static void FreeBSDProcess_writeField(const Process* this, RichString* str, Proc RichString_appendWide(str, attr, buffer); } -static long FreeBSDProcess_compare(const void* v1, const void* v2) { - const FreeBSDProcess *p1, *p2; - const Settings *settings = ((const Process*)v1)->settings; +static long FreeBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) { + const FreeBSDProcess* p1 = (const FreeBSDProcess*)v1; + const FreeBSDProcess* p2 = (const FreeBSDProcess*)v2; - if (settings->direction == 1) { - p1 = (const FreeBSDProcess*)v1; - p2 = (const FreeBSDProcess*)v2; - } else { - p2 = (const FreeBSDProcess*)v1; - p1 = (const FreeBSDProcess*)v2; - } - - switch ((int) settings->sortKey) { + switch ((int) key) { // add FreeBSD-specific fields here case JID: return SPACESHIP_NUMBER(p1->jid, p2->jid); @@ -129,7 +121,7 @@ static long FreeBSDProcess_compare(const void* v1, const void* v2) { case TTY_NR: return SPACESHIP_NULLSTR(p1->ttyPath, p2->ttyPath); default: - return Process_compare(v1, v2); + return SPACESHIP_NUMBER(v1->pid, v2->pid); } } @@ -148,7 +140,8 @@ const ProcessClass FreeBSDProcess_class = { .extends = Class(Process), .display = Process_display, .delete = Process_delete, - .compare = FreeBSDProcess_compare + .compare = Process_compare }, .writeField = FreeBSDProcess_writeField, + .compareByKey = FreeBSDProcess_compareByKey }; |