qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 23:20:08 -07:00
Code Releases Activity

runtime: fix accidentally exported OpenBSD constants

Browse Source 
Change-Id: I2de63668a1c0152cc329df55c2d6d014e8183158
Reviewed-on: https://go-review.googlesource.com/4943
Reviewed-by: Minux Ma <minux@golang.org>
This commit is contained in:
Matthew Dempsky 2015-02-16 18:18:13 +09:00 committed by Minux Ma
parent 9df81f8221
commit 95ab84a34f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/runtime/os1_openbsd.go
View File

@ -7,16 +7,16 @@ package runtime
import "unsafe" import "unsafe"
const ( const (
ESRCH = 3 _ESRCH = 3
EAGAIN = 35 _EAGAIN = 35
EWOULDBLOCK = EAGAIN _EWOULDBLOCK = _EAGAIN
ENOTSUP = 91 _ENOTSUP = 91
// From OpenBSD's sys/time.h // From OpenBSD's sys/time.h
CLOCK_REALTIME = 0 _CLOCK_REALTIME = 0
CLOCK_VIRTUAL = 1 _CLOCK_VIRTUAL = 1
CLOCK_PROF = 2 _CLOCK_PROF = 2
CLOCK_MONOTONIC = 3 _CLOCK_MONOTONIC = 3
) )
var sigset_none = uint32(0) var sigset_none = uint32(0)
@ -24,12 +24,12 @@ var sigset_all = ^sigset_none
// From OpenBSD's <sys/sysctl.h> // From OpenBSD's <sys/sysctl.h>
const ( const (
CTL_HW = 6 _CTL_HW = 6
HW_NCPU = 3 _HW_NCPU = 3
) )
func getncpu() int32 { func getncpu() int32 {
mib := [2]uint32{CTL_HW, HW_NCPU} mib := [2]uint32{_CTL_HW, _HW_NCPU}
out := uint32(0) out := uint32(0)
nout := unsafe.Sizeof(out) nout := unsafe.Sizeof(out)
@ -80,8 +80,8 @@ func semasleep(ns int64) int32 {
// sleep until semaphore != 0 or timeout. // sleep until semaphore != 0 or timeout.
// thrsleep unlocks m.waitsemalock. // thrsleep unlocks m.waitsemalock.
ret := thrsleep((uintptr)(unsafe.Pointer(&_g_.m.waitsemacount)), CLOCK_MONOTONIC, tsp, (uintptr)(unsafe.Pointer(&_g_.m.waitsemalock)), (*int32)(unsafe.Pointer(&_g_.m.waitsemacount))) ret := thrsleep(uintptr(unsafe.Pointer(&_g_.m.waitsemacount)), _CLOCK_MONOTONIC, tsp, uintptr(unsafe.Pointer(&_g_.m.waitsemalock)), (*int32)(unsafe.Pointer(&_g_.m.waitsemacount)))
if ret == EWOULDBLOCK { if ret == _EWOULDBLOCK {
return -1 return -1
} }
} }
@ -98,7 +98,7 @@ func semawakeup(mp *m) {
} }
mp.waitsemacount++ mp.waitsemacount++
ret := thrwakeup(uintptr(unsafe.Pointer(&mp.waitsemacount)), 1) ret := thrwakeup(uintptr(unsafe.Pointer(&mp.waitsemacount)), 1)
if ret != 0 && ret != ESRCH { if ret != 0 && ret != _ESRCH {
// semawakeup can be called on signal stack. // semawakeup can be called on signal stack.
systemstack(func() { systemstack(func() {
print("thrwakeup addr=", &mp.waitsemacount, " sem=", mp.waitsemacount, " ret=", ret, "\n") print("thrwakeup addr=", &mp.waitsemacount, " sem=", mp.waitsemacount, " ret=", ret, "\n")
@ -127,7 +127,7 @@ func newosproc(mp *m, stk unsafe.Pointer) {
if ret < 0 { if ret < 0 {
print("runtime: failed to create new OS thread (have ", mcount()-1, " already; errno=", -ret, ")\n") print("runtime: failed to create new OS thread (have ", mcount()-1, " already; errno=", -ret, ")\n")
if ret == -ENOTSUP { if ret == -_ENOTSUP {
print("runtime: is kern.rthreads disabled?\n") print("runtime: is kern.rthreads disabled?\n")
} }
throw("runtime.newosproc") throw("runtime.newosproc")