Commit a2a7ea48 by Ian Lance Taylor

runtime: rename siginfo to _siginfo_t

    
    Since the name siginfo winds up in runtime.inc, this avoids a name
    collision on systems that define "struct siginfo" in the system header
    files.
    
    Reviewed-on: https://go-review.googlesource.com/35239

From-SVN: r244484
parent 58a3a26b
a28b04adaeff8de61c336374db66b24ed96c30f0 223cba75b947afc1ee5a13a60c15c66f6ff355c1
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.
...@@ -46,15 +46,13 @@ func kill(pid _pid_t, sig uint32) int32 ...@@ -46,15 +46,13 @@ func kill(pid _pid_t, sig uint32) int32
//extern setitimer //extern setitimer
func setitimer(which int32, new *_itimerval, old *_itimerval) int32 func setitimer(which int32, new *_itimerval, old *_itimerval) int32
type siginfo _siginfo_t
type sigTabT struct { type sigTabT struct {
flags int32 flags int32
name string name string
} }
type sigctxt struct { type sigctxt struct {
info *siginfo info *_siginfo_t
ctxt unsafe.Pointer ctxt unsafe.Pointer
} }
...@@ -128,9 +126,9 @@ func raiseproc(sig uint32) { ...@@ -128,9 +126,9 @@ func raiseproc(sig uint32) {
//go:nosplit //go:nosplit
//go:nowritebarrierrec //go:nowritebarrierrec
func sigfwd(fn uintptr, sig uint32, info *siginfo, ctx unsafe.Pointer) { func sigfwd(fn uintptr, sig uint32, info *_siginfo_t, ctx unsafe.Pointer) {
f1 := &[1]uintptr{fn} f1 := &[1]uintptr{fn}
f2 := *(*func(uint32, *siginfo, unsafe.Pointer))(unsafe.Pointer(&f1)) f2 := *(*func(uint32, *_siginfo_t, unsafe.Pointer))(unsafe.Pointer(&f1))
f2(sig, info, ctx) f2(sig, info, ctx)
} }
......
...@@ -25,7 +25,7 @@ var crashing int32 ...@@ -25,7 +25,7 @@ var crashing int32
// are not allowed. // are not allowed.
// //
//go:nowritebarrierrec //go:nowritebarrierrec
func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) { func sighandler(sig uint32, info *_siginfo_t, ctxt unsafe.Pointer, gp *g) {
_g_ := getg() _g_ := getg()
c := sigctxt{info, ctxt} c := sigctxt{info, ctxt}
......
...@@ -202,7 +202,7 @@ func sigpipe() { ...@@ -202,7 +202,7 @@ func sigpipe() {
// This is called by the signal handler, and the world may be stopped. // This is called by the signal handler, and the world may be stopped.
//go:nosplit //go:nosplit
//go:nowritebarrierrec //go:nowritebarrierrec
func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) { func sigtrampgo(sig uint32, info *_siginfo_t, ctx unsafe.Pointer) {
if sigfwdgo(sig, info, ctx) { if sigfwdgo(sig, info, ctx) {
return return
} }
...@@ -446,7 +446,7 @@ func badsignal(sig uintptr, c *sigctxt) { ...@@ -446,7 +446,7 @@ func badsignal(sig uintptr, c *sigctxt) {
// This is called by the signal handler, and the world may be stopped. // This is called by the signal handler, and the world may be stopped.
//go:nosplit //go:nosplit
//go:nowritebarrierrec //go:nowritebarrierrec
func sigfwdgo(sig uint32, info *siginfo, ctx unsafe.Pointer) bool { func sigfwdgo(sig uint32, info *_siginfo_t, ctx unsafe.Pointer) bool {
if sig >= uint32(len(sigtable)) { if sig >= uint32(len(sigtable)) {
return false return false
} }
......
...@@ -485,10 +485,10 @@ func setSigactionHandler(*_sigaction, uintptr) ...@@ -485,10 +485,10 @@ func setSigactionHandler(*_sigaction, uintptr)
// Retrieve fields from the siginfo_t and ucontext_t pointers passed // Retrieve fields from the siginfo_t and ucontext_t pointers passed
// to a signal handler using C, as they are often hidden in a union. // to a signal handler using C, as they are often hidden in a union.
// Returns and, if available, PC where signal occurred. // Returns and, if available, PC where signal occurred.
func getSiginfo(*siginfo, unsafe.Pointer) (sigaddr uintptr, sigpc uintptr) func getSiginfo(*_siginfo_t, unsafe.Pointer) (sigaddr uintptr, sigpc uintptr)
// Implemented in C for gccgo. // Implemented in C for gccgo.
func dumpregs(*siginfo, unsafe.Pointer) func dumpregs(*_siginfo_t, unsafe.Pointer)
// Temporary for gccgo until we port proc.go. // Temporary for gccgo until we port proc.go.
//go:linkname getsched runtime.getsched //go:linkname getsched runtime.getsched
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment