os: use ignoringEINTR2 in (*Process).pidWait

This was missed in CL 627479.

Change-Id: Ibcd511573c330bf782fe6a8a50d56bb70aedf3c7
Reviewed-on: https://go-review.googlesource.com/c/go/+/629915
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/os/exec_unix.go b/src/os/exec_unix.go
index ba6146ada11b8e8d646f97f9a28b040c57e8d58d..34467ac7a039adf0892369133f8198377e9ffdb8 100644 (file)
--- a/src/os/exec_unix.go
+++ b/src/os/exec_unix.go
@@ -63,17 +63,12 @@ func (p *Process) pidWait() (*ProcessState, error) {
        var (
                status syscall.WaitStatus
                rusage syscall.Rusage
-               pid1   int
-               e      error
        )
-       for {
-               pid1, e = syscall.Wait4(p.Pid, &status, 0, &rusage)
-               if e != syscall.EINTR {
-                       break
-               }
-       }
-       if e != nil {
-               return nil, NewSyscallError("wait", e)
+       pid1, err := ignoringEINTR2(func() (int, error) {
+               return syscall.Wait4(p.Pid, &status, 0, &rusage)
+       })
+       if err != nil {
+               return nil, NewSyscallError("wait", err)
        }
        p.pidDeactivate(statusDone)
        return &ProcessState{