Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions resource_monitor/src/resource_monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,29 +1367,38 @@ void rmonitor_add_children_by_polling()

uint64_t pid;
struct rmonitor_process_info *p;
uint64_t *children = NULL;

/* rmonitor_track_process inserts into processes, which cannot be done
* while iterating over processes. Collect the children first. */
uint64_t *found = NULL;
int found_count = 0;

ITABLE_ITERATE(processes, iteration, pid, p)
{
if (!p->running) {
continue;
}

uint64_t *children = NULL;
int n = rmonitor_get_children(pid, &children);

if (n < 1) {
continue;
}

int i;
for (i = 0; i < n; i++) {
if (rmonitor_track_process(children[i])) {
debug(D_RMON, "added by polling pid %" PRIu64, children[i]);
}
if (n > 0) {
found = xxrealloc(found, (found_count + n) * sizeof(*found));
memcpy(found + found_count, children, n * sizeof(*found));
found_count += n;
}

free(children);
}

int i;
for (i = 0; i < found_count; i++) {
if (rmonitor_track_process(found[i])) {
debug(D_RMON, "added by polling pid %" PRIu64, found[i]);
}
}

free(found);
}

void cleanup_zombie(struct rmonitor_process_info *p)
Expand Down
Loading