mirror of
https://github.com/golang/go
synced 2024-10-04 11:11:21 -06:00
9208ed3224
The previous fix was wrong because it had two misunderstandings on
freebsd32 calling convention like the following:
- 32-bit id1 implies that it is the upper half of 64-bit id, indeed it
depends on machine endianness.
- 32-bit ARM calling convension doesn't conform to freebsd32_args,
indeed it does.
This change fixes the bugs and makes blockUntilWaitable work correctly
on freebsd/{386,arm}.
Fixes #16064.
Change-Id: I820c6d01d59a43ac4f2ab381f757c03b14bca75e
Reviewed-on: https://go-review.googlesource.com/24064
Reviewed-by: Ian Lance Taylor <iant@golang.org>
41 lines
1.4 KiB
Go
41 lines
1.4 KiB
Go
// Copyright 2016 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// +build freebsd
|
|
|
|
package os
|
|
|
|
import (
|
|
"runtime"
|
|
"syscall"
|
|
)
|
|
|
|
const _P_PID = 0
|
|
|
|
// blockUntilWaitable attempts to block until a call to p.Wait will
|
|
// succeed immediately, and returns whether it has done so.
|
|
// It does not actually call p.Wait.
|
|
func (p *Process) blockUntilWaitable() (bool, error) {
|
|
var errno syscall.Errno
|
|
// The arguments on 32-bit FreeBSD look like the following:
|
|
// - freebsd32_wait6_args{ idtype, id1, id2, status, options, wrusage, info } or
|
|
// - freebsd32_wait6_args{ idtype, pad, id1, id2, status, options, wrusage, info } when PAD64_REQUIRED=1 on ARM, MIPS or PowerPC
|
|
if runtime.GOARCH == "386" {
|
|
_, _, errno = syscall.Syscall9(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0, 0, 0)
|
|
} else if runtime.GOARCH == "arm" {
|
|
_, _, errno = syscall.Syscall9(syscall.SYS_WAIT6, _P_PID, 0, uintptr(p.Pid), 0, 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0, 0)
|
|
} else {
|
|
_, _, errno = syscall.Syscall6(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0)
|
|
}
|
|
if errno != 0 {
|
|
// The wait6 system call is supported only on FreeBSD
|
|
// 9.3 and above, so it may return an ENOSYS error.
|
|
if errno == syscall.ENOSYS {
|
|
return false, nil
|
|
}
|
|
return false, NewSyscallError("wait6", errno)
|
|
}
|
|
return true, nil
|
|
}
|