sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PM: make child time accumulation POSIX compliant

Browse source 
POSIX states that times() and getrusage() should only return child
user and system times of terminated children for which wait*() has
returned their PIDs.

Change-Id: I38e19ad71543a3b91e944bef8e4e1bd903de51bf
This commit is contained in:
David van Moolenbroek 2015-09-27 12:32:23 +00:00
parent b80da2a01d
commit 0f5c95a00b
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
minix/servers/pm/forkexit.c
View file

@ -261,7 +261,6 @@ int dump_core; /* flag indicating whether to dump core */
register int proc_nr, proc_nr_e; register int proc_nr, proc_nr_e;
int r; int r;
pid_t procgrp; pid_t procgrp;
struct mproc *p_mp;
clock_t user_time, sys_time; clock_t user_time, sys_time;
message m; message m;
@ -284,13 +283,13 @@ int dump_core; /* flag indicating whether to dump core */
/* If the exited process has a timer pending, kill it. */ /* If the exited process has a timer pending, kill it. */
if (rmp->mp_flags & ALARM_ON) set_alarm(rmp, (clock_t) 0); if (rmp->mp_flags & ALARM_ON) set_alarm(rmp, (clock_t) 0);
/* Do accounting: fetch usage times and accumulate at parent. */ /* Do accounting: fetch usage times and save with dead child process.
* POSIX forbids accumulation at parent until child has been waited for.
*/
if((r=sys_times(proc_nr_e, &user_time, &sys_time, NULL, NULL)) != OK) if((r=sys_times(proc_nr_e, &user_time, &sys_time, NULL, NULL)) != OK)
panic("exit_proc: sys_times failed: %d", r); panic("exit_proc: sys_times failed: %d", r);
rmp->mp_child_utime += user_time; /* add user time */
p_mp = &mproc[rmp->mp_parent]; /* process' parent */ rmp->mp_child_stime += sys_time; /* add system time */
p_mp->mp_child_utime += user_time + rmp->mp_child_utime; /* add user time */
p_mp->mp_child_stime += sys_time + rmp->mp_child_stime; /* add system time */
/* Tell the kernel the process is no longer runnable to prevent it from /* Tell the kernel the process is no longer runnable to prevent it from
* being scheduled in between the following steps. Then tell VFS that it * being scheduled in between the following steps. Then tell VFS that it
@ -654,6 +653,12 @@ register struct mproc *child; /* tells which process is exiting */
parent->mp_flags &= ~WAITING; /* parent no longer waiting */ parent->mp_flags &= ~WAITING; /* parent no longer waiting */
child->mp_flags &= ~ZOMBIE; /* child no longer a zombie */ child->mp_flags &= ~ZOMBIE; /* child no longer a zombie */
child->mp_flags |= TOLD_PARENT; /* avoid informing parent twice */ child->mp_flags |= TOLD_PARENT; /* avoid informing parent twice */
/* Now that the child has been waited for, accumulate the times of the
* terminated child process at the parent.
*/
parent->mp_child_utime += child->mp_child_utime;
parent->mp_child_stime += child->mp_child_stime;
} }
/*===========================================================================* /*===========================================================================*