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

Implement stable tie-breaker and add more defaultSortDesc fields as per cgzones' suggestions, simplify Process_compare flow from BenBE

Browse Source
This commit is contained in:
Daniel Lange
2021-01-21 20:57:34 +01:00
parent 4531b31d92
commit 074703bd5c
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Process.c
View File

@ -489,24 +489,21 @@ int Process_pidCompare(const void* v1, const void* v2) {
}
int Process_compare(const void* v1, const void* v2) {
const Process *p1, *p2;
const Settings *settings = ((const Process*)v1)->settings;
const Process *p1 = (const Process*)v1;
const Process *p2 = (const Process*)v2;
if (Settings_getActiveDirection(settings) == 1) {
p1 = (const Process*)v1;
p2 = (const Process*)v2;
} else {
p2 = (const Process*)v1;
p1 = (const Process*)v2;
}
const Settings *settings = p1->settings;
ProcessField key = Settings_getActiveSortKey(settings);
int result = Process_compareByKey(p1, p2, key);
if (Settings_getActiveDirection(settings) != 1)
result = -result;
// Implement tie-breaker (needed to make tree mode more stable)
if (!result)
result = SPACESHIP_NUMBER(p1->pid, p2->pid);
return SPACESHIP_NUMBER(p1->pid, p2->pid);
return result;
}