GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 14:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lift getrusage() from wait_noreap_copyout()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-14 21:25:03 -04:00
parent 67d7ddded3
commit e61a250229
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/exit.c
View file

@ -1062,9 +1062,6 @@ static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p,
{ {
struct waitid_info *infop; struct waitid_info *infop;
if (wo->wo_rusage)
getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
put_task_struct(p); put_task_struct(p);
infop = wo->wo_info; infop = wo->wo_info;
if (infop) { if (infop) {
@ -1099,6 +1096,8 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
get_task_struct(p); get_task_struct(p);
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
sched_annotate_sleep(); sched_annotate_sleep();
if (wo->wo_rusage)
getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
if ((exit_code & 0x7f) == 0) { if ((exit_code & 0x7f) == 0) {
why = CLD_EXITED; why = CLD_EXITED;
@ -1296,12 +1295,12 @@ unlock_sig:
why = ptrace ? CLD_TRAPPED : CLD_STOPPED; why = ptrace ? CLD_TRAPPED : CLD_STOPPED;
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
sched_annotate_sleep(); sched_annotate_sleep();
if (wo->wo_rusage)
getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
if (unlikely(wo->wo_flags & WNOWAIT)) if (unlikely(wo->wo_flags & WNOWAIT))
return wait_noreap_copyout(wo, p, pid, uid, why, exit_code); return wait_noreap_copyout(wo, p, pid, uid, why, exit_code);
if (wo->wo_rusage)
getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
wo->wo_stat = (exit_code << 8) | 0x7f; wo->wo_stat = (exit_code << 8) | 0x7f;
infop = wo->wo_info; infop = wo->wo_info;
@ -1350,10 +1349,10 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
get_task_struct(p); get_task_struct(p);
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
sched_annotate_sleep(); sched_annotate_sleep();
if (!wo->wo_info) {
if (wo->wo_rusage) if (wo->wo_rusage)
getrusage(p, RUSAGE_BOTH, wo->wo_rusage); getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
if (!wo->wo_info) {
put_task_struct(p); put_task_struct(p);
wo->wo_stat = 0xffff; wo->wo_stat = 0xffff;
retval = pid; retval = pid;