zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: infinite loop in tree view on macOS 

Fixes #688, the bug regressed on 584a9bc.

On Mac OS X 10.11.6, all processes have their parents since there's a
special process named "kernel_task", whose PID and PPID are 0. As a
result, `this->processes` is never changed causing infinite `while`.
This commit is contained in:
Wataru Ashihara 2018-01-02 23:15:45 +09:00 committed by Hisham Muhammad
parent 87be623eac
commit b34d76cd41
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ProcessList.c
View File

@ -231,6 +231,11 @@ void ProcessList_sort(ProcessList* this) {
pid_t ppid = process->tgid == process->pid ? process->ppid : process->tgid; pid_t ppid = process->tgid == process->pid ? process->ppid : process->tgid;
// Bisect the process vector to find parent // Bisect the process vector to find parent
int l = 0, r = size; int l = 0, r = size;
// If PID corresponds with PPID (e.g. "kernel_task" (PID:0, PPID:0)
// on Mac OS X 10.11.6) cancel bisecting and regard this process as
// root.
if (process->pid == ppid)
r = 0;
while (l < r) { while (l < r) {
int c = (l + r) / 2; int c = (l + r) / 2;
pid_t pid = ((Process*)(Vector_get(this->processes, c)))->pid; pid_t pid = ((Process*)(Vector_get(this->processes, c)))->pid;