Catch up to r325719 which makes the kern.proc.pid sysctl "work" for zombies.
Some of the ptrace tests need to wait for a child process to become a zombie before preceding. The parent process polls the child process via the kern.proc.pid sysctl to wait for it to become a zombie. Previously the code polled until the sysctl failed with ESRCH. Now it will poll until either the sysctl fails with ESRCH (for compatiblity with older kernels) or returns a kinfo_proc structure with the ki_stat field set to SZOMB. Reported by: Jenkins Tested by: markj Discussed with: mjg MFC after: 1 week
This commit is contained in:
parent
989c7f0b7c
commit
3a014c56c1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=326953
@ -104,6 +104,10 @@ wait_for_zombie(pid_t pid)
|
||||
/*
|
||||
* Wait for a process to exit. This is kind of gross, but
|
||||
* there is not a better way.
|
||||
*
|
||||
* Prior to r325719, the kern.proc.pid.<pid> sysctl failed
|
||||
* with ESRCH. After that change, a valid struct kinfo_proc
|
||||
* is returned for zombies with ki_stat set to SZOMB.
|
||||
*/
|
||||
for (;;) {
|
||||
struct kinfo_proc kp;
|
||||
@ -116,10 +120,11 @@ wait_for_zombie(pid_t pid)
|
||||
mib[3] = pid;
|
||||
len = sizeof(kp);
|
||||
if (sysctl(mib, nitems(mib), &kp, &len, NULL, 0) == -1) {
|
||||
/* The KERN_PROC_PID sysctl fails for zombies. */
|
||||
ATF_REQUIRE(errno == ESRCH);
|
||||
break;
|
||||
}
|
||||
if (kp.ki_stat == SZOMB)
|
||||
break;
|
||||
usleep(5000);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user