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

Split boilerplate and platform-independent field comparison

Browse Source 
This acheives two things:
- Allows for simple tie-breaking if values compare equal (needed to make sorting the tree-view stable)
- Allows for platform-dependent overriding of the sort-order for specific fields

Also fixes a small oversight on DragonFlyBSD when default-sorting.
This commit is contained in:
Benny Baumann
2020-12-18 22:12:26 +01:00
committed by BenBE
parent 2327260ee8
commit 77db240b48
8 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Process.c
View File

@ -495,7 +495,6 @@ 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_getActiveDirection(settings) == 1) {
p1 = (const Process*)v1;
@ -507,7 +506,19 @@ long Process_compare(const void* v1, const void* v2) {
ProcessField key = Settings_getActiveSortKey(settings);
switch (key) {
long result = Process_compareByKey(p1, p2, key);
// Implement tie-breaker (needed to make tree mode more stable)
if (!result)
result = SPACESHIP_NUMBER(p1->pid, p2->pid);
return result;
}
long Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key) {
int r;
switch ((int) key) {
case PERCENT_CPU:
case PERCENT_NORM_CPU:
return SPACESHIP_NUMBER(p2->percent_cpu, p1->percent_cpu);
@ -557,6 +568,6 @@ long Process_compare(const void* v1, const void* v2) {
case USER:
return SPACESHIP_NULLSTR(p1->user, p2->user);
default:
return Process_compareByKey(p1, p2, key);
return SPACESHIP_NUMBER(p1->pid, p2->pid);
}
}