diff options
Diffstat (limited to 'src/libvmon')
| -rw-r--r-- | src/libvmon/vmon.c | 8 | ||||
| -rw-r--r-- | src/libvmon/vmon.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/libvmon/vmon.c b/src/libvmon/vmon.c index e8a8d23..b4c008c 100644 --- a/src/libvmon/vmon.c +++ b/src/libvmon/vmon.c @@ -442,6 +442,7 @@ static vmon_proc_t * proc_monitor(vmon_t *vmon, vmon_proc_t *parent, int pid, vm list_add_tail(&proc->threads, &parent->threads); parent->threads_changed = 1; parent->is_threaded = 1; + parent->n_current_threads++; } else { list_add_tail(&proc->siblings, &parent->children); parent->children_changed = 1; @@ -643,6 +644,8 @@ static int proc_follow_threads(vmon_t *vmon, vmon_proc_t *proc, vmon_proc_follow list_for_each_entry(tmp, &proc->threads, threads) tmp->is_stale = 1; + proc->n_current_threads = 0; + /* FIXME: the changes count seems to be unused here, so this currently always returns SAMPLE_UNCHANGED, and * it's unclear to me if that was intentional or just never finished. */ @@ -679,8 +682,11 @@ static int proc_follow_threads(vmon_t *vmon, vmon_proc_t *proc, vmon_proc_follow list_for_each_entry_safe(tmp, _tmp, &proc->threads, threads) { /* set children not found to stale status so the caller can respond and on our next sample invocation we will unmonitor them */ - if (tmp->generation != vmon->generation) + if (tmp->generation != vmon->generation) { tmp->is_stale = 1; + assert(proc->n_current_threads); + proc->n_current_threads--; + } } return changes ? SAMPLE_CHANGED : SAMPLE_UNCHANGED; diff --git a/src/libvmon/vmon.h b/src/libvmon/vmon.h index f1042c9..4f17d12 100644 --- a/src/libvmon/vmon.h +++ b/src/libvmon/vmon.h @@ -232,6 +232,7 @@ typedef struct _vmon_proc_t { list_head_t children; /* head of the children of this process, empty when no children */ list_head_t siblings; /* node in siblings list */ list_head_t threads; /* head or node for the threads list, empty when process has no threads */ + unsigned n_current_threads; /* count of non-stale nodes in the threads list */ struct _vmon_proc_t *parent; /* reference to the parent */ |