diff options
| author | Alexander Pyhalov <[email protected]> | 2018-05-04 16:28:18 +0300 |
|---|---|---|
| committer | Alexander Pyhalov <[email protected]> | 2018-05-07 18:41:39 +0300 |
| commit | 5b1f551af8a58ab768d3e49d24ebadf53f5db360 (patch) | |
| tree | fad38943c006382408de14036e7ae7f09809b510 | |
| parent | bf08ac4e371b71488af5a52633ffdb045114906d (diff) | |
| download | mate-system-monitor-5b1f551af8a58ab768d3e49d24ebadf53f5db360.tar.bz2 mate-system-monitor-5b1f551af8a58ab768d3e49d24ebadf53f5db360.tar.xz | |
fix crash on systems with pid 0
fixes #118
| -rw-r--r-- | src/procman.h | 4 | ||||
| -rw-r--r-- | src/proctable.cpp | 23 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/procman.h b/src/procman.h index d3db85c..d7f1ce9 100644 --- a/src/procman.h +++ b/src/procman.h @@ -190,8 +190,8 @@ class ProcInfo gchar *security_context; - const guint pid; - guint ppid; + const pid_t pid; + pid_t ppid; guint uid; // private: diff --git a/src/proctable.cpp b/src/proctable.cpp index f4e1e54..f2eb3b5 100644 --- a/src/proctable.cpp +++ b/src/proctable.cpp @@ -812,7 +812,15 @@ update_info (ProcData *procdata, ProcInfo *info) ProcInfo::cpu_times[info->pid] = info->cpu_time = proctime.rtime; info->nice = procuid.nice; - info->ppid = procuid.ppid; + + // set the ppid only if one can exist + // i.e. pid=0 can never have a parent + if (info->pid > 0) { + info->ppid = procuid.ppid; + } + + g_assert(info->pid != info->ppid); + g_assert(info->ppid != -1 || info->pid == 0); /* get cgroup data */ get_process_cgroup_info(info); @@ -822,11 +830,14 @@ update_info (ProcData *procdata, ProcInfo *info) ProcInfo::ProcInfo(pid_t pid) - : tooltip(NULL), + : node(), + pixbuf(), + tooltip(NULL), name(NULL), arguments(NULL), security_context(NULL), pid(pid), + ppid(-1), uid(-1) { ProcInfo * const info = this; @@ -943,6 +954,8 @@ refresh_list (ProcData *procdata, const pid_t* pid_list, const guint n) // inserts the process in the treeview if : + // - it has no parent (ppid = -1), + // ie it is for example the [kernel] on FreeBSD // - it is init // - its parent is already in tree // - its parent is unreachable @@ -956,7 +969,7 @@ refresh_list (ProcData *procdata, const pid_t* pid_list, const guint n) // see proctable_update_list (ProcData * const procdata) - if ((*it)->ppid == 0 or in_tree.find((*it)->ppid) != in_tree.end()) { + if ((*it)->ppid <= 0 or in_tree.find((*it)->ppid) != in_tree.end()) { insert_info_to_tree(*it, procdata); in_tree.insert((*it)->pid); it = addition.erase(it); @@ -1031,6 +1044,10 @@ proctable_update_list (ProcData * const procdata) procdata->cpu_total_time = MAX(cpu.total - procdata->cpu_total_time_last, 1); procdata->cpu_total_time_last = cpu.total; + // FIXME: not sure if glibtop always returns a sorted list of pid + // but it is important otherwise refresh_list won't find the parent + std::sort(pid_list, pid_list + proclist.number); + refresh_list (procdata, pid_list, proclist.number); selection.restore(procdata->tree); |