diff options
Diffstat (limited to 'proc')
| -rw-r--r-- | proc/info.c | 8 | ||||
| -rw-r--r-- | proc/proc.h | 4 | ||||
| -rw-r--r-- | proc/wait.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/proc/info.c b/proc/info.c index 2d85662d..e5b0f472 100644 --- a/proc/info.c +++ b/proc/info.c @@ -1093,3 +1093,11 @@ S_proc_get_exe (struct proc *callerp, return 0; } +kern_return_t +S_proc_getchildren_rusage (struct proc *p, struct rusage *ru) +{ + if (!p) + return EOPNOTSUPP; + *ru = p->p_child_rusage; + return 0; +} diff --git a/proc/proc.h b/proc/proc.h index a83a5090..bbba0958 100644 --- a/proc/proc.h +++ b/proc/proc.h @@ -76,7 +76,9 @@ struct proc int p_sigcode; struct rusage p_rusage; /* my usage if I'm dead, to return via wait */ - struct rusage p_child_rusage; /* accumulates p_rusage of all dead children */ + /* Accumulates p_rusage of all dead children, including + * grandchildren and their descendants. */ + struct rusage p_child_rusage; unsigned int p_exec:1; /* has called proc_mark_exec */ unsigned int p_stopped:1; /* has called proc_mark_stop */ diff --git a/proc/wait.c b/proc/wait.c index 4551d289..a31b0e73 100644 --- a/proc/wait.c +++ b/proc/wait.c @@ -156,6 +156,8 @@ alert_parent (struct proc *p) { /* We accumulate the aggregate usage stats of all our dead children. */ rusage_add (&p->p_parent->p_child_rusage, &p->p_rusage); + /* ... and descendants. */ + rusage_add (&p->p_parent->p_child_rusage, &p->p_child_rusage); send_signal (p->p_parent->p_msgport, SIGCHLD, CLD_EXITED, p->p_parent->p_task); |