vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Fix s390x build failure by removing golang.org/x/sys

Browse source 
This fix tries to fix the issue raised in #24168 where
golang.org/x/sys causes s390x build failure.

This fix removed the import of "golang.org/x/sys/unix".

This fix fixes #24168.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-06-30 06:26:34 -07:00
parent 2f63d74eda
commit f718d6b8c6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sysinfo/numcpu_linux.go
View file

@ -6,8 +6,6 @@ import (
"runtime" "runtime"
"syscall" "syscall"
"unsafe" "unsafe"
"golang.org/x/sys/unix"
) )
// numCPU queries the system for the count of threads available // numCPU queries the system for the count of threads available
@ -17,10 +15,10 @@ import (
// Returns 0 on errors. Use |runtime.NumCPU| in that case. // Returns 0 on errors. Use |runtime.NumCPU| in that case.
func numCPU() int { func numCPU() int {
// Gets the affinity mask for a process: The very one invoking this function. // Gets the affinity mask for a process: The very one invoking this function.
pid, _, _ := syscall.RawSyscall(unix.SYS_GETPID, 0, 0, 0) pid, _, _ := syscall.RawSyscall(syscall.SYS_GETPID, 0, 0, 0)
var mask [1024 / 64]uintptr var mask [1024 / 64]uintptr
_, _, err := syscall.RawSyscall(unix.SYS_SCHED_GETAFFINITY, pid, uintptr(len(mask)*8), uintptr(unsafe.Pointer(&mask[0]))) _, _, err := syscall.RawSyscall(syscall.SYS_SCHED_GETAFFINITY, pid, uintptr(len(mask)*8), uintptr(unsafe.Pointer(&mask[0])))
if err != 0 { if err != 0 {
return 0 return 0
} }