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 /openbsd | |
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 'openbsd')
-rw-r--r-- | openbsd/OpenBSDProcess.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c index 9aab53e5..532093f1 100644 --- a/openbsd/OpenBSDProcess.c +++ b/openbsd/OpenBSDProcess.c @@ -212,25 +212,17 @@ static void OpenBSDProcess_writeField(const Process* this, RichString* str, Proc RichString_appendWide(str, attr, buffer); } -static long OpenBSDProcess_compare(const void* v1, const void* v2) { - const OpenBSDProcess *p1, *p2; - const Settings *settings = ((const Process*)v1)->settings; - - if (settings->direction == 1) { - p1 = (const OpenBSDProcess*)v1; - p2 = (const OpenBSDProcess*)v2; - } else { - p2 = (const OpenBSDProcess*)v1; - p1 = (const OpenBSDProcess*)v2; - } +static long OpenBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) { + const OpenBSDProcess* p1 = (const OpenBSDProcess*)v1; + const OpenBSDProcess* p2 = (const OpenBSDProcess*)v2; // remove if actually used (void)p1; (void)p2; - switch (settings->sortKey) { + switch ((int) key) { // add OpenBSD-specific fields here default: - return Process_compare(v1, v2); + return SPACESHIP_NUMBER(v1->pid, v2->pid); } } @@ -239,9 +231,10 @@ const ProcessClass OpenBSDProcess_class = { .extends = Class(Process), .display = Process_display, .delete = Process_delete, - .compare = OpenBSDProcess_compare + .compare = Process_compare }, .writeField = OpenBSDProcess_writeField, + .compareByKey = OpenBSDProcess_compareByKey }; bool Process_isThread(const Process* this) { |