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

runtime: convert m.cgoCallersUse to atomic type

Browse Source 
Updates #53821

Change-Id: I99b01f8e91b798e73275635c8a63fcdc4a8df9f1
Reviewed-on: https://go-review.googlesource.com/c/go/+/423888
Auto-Submit: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
Reviewed-by: Keith Randall <khr@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
This commit is contained in:
Cuong Manh Le 2022-08-17 17:39:01 +07:00 committed by Gopher Robot
parent 83b223ec3a
commit f6efcf1fbb
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/proc.go
View File

@ -4609,7 +4609,7 @@ func sigprof(pc, sp, lr uintptr, gp *g, mp *m) {
// cgoCallers. We are running in a signal handler // cgoCallers. We are running in a signal handler
// with all signals blocked, so we don't have to worry // with all signals blocked, so we don't have to worry
// about any other code interrupting us. // about any other code interrupting us.
if atomic.Load(&mp.cgoCallersUse) == 0 && mp.cgoCallers != nil && mp.cgoCallers[0] != 0 { if mp.cgoCallersUse.Load() == 0 && mp.cgoCallers != nil && mp.cgoCallers[0] != 0 {
for cgoOff < len(mp.cgoCallers) && mp.cgoCallers[cgoOff] != 0 { for cgoOff < len(mp.cgoCallers) && mp.cgoCallers[cgoOff] != 0 {
cgoOff++ cgoOff++
} }

8
src/runtime/runtime2.go
View File

@ -550,10 +550,10 @@ type m struct {
fastrand uint64 fastrand uint64
needextram bool needextram bool
traceback uint8 traceback uint8
ncgocall uint64 // number of cgo calls in total ncgocall uint64 // number of cgo calls in total
ncgo int32 // number of cgo calls currently in progress ncgo int32 // number of cgo calls currently in progress
cgoCallersUse uint32 // if non-zero, cgoCallers in use temporarily cgoCallersUse atomic.Uint32 // if non-zero, cgoCallers in use temporarily
cgoCallers *cgoCallers // cgo traceback if crashing in cgo call cgoCallers *cgoCallers // cgo traceback if crashing in cgo call
park note park note
alllink *m // on allm alllink *m // on allm
schedlink muintptr schedlink muintptr

5
src/runtime/traceback.go
View File

@ -7,7 +7,6 @@ package runtime
import ( import (
"internal/bytealg" "internal/bytealg"
"internal/goarch" "internal/goarch"
"runtime/internal/atomic"
"runtime/internal/sys" "runtime/internal/sys"
"unsafe" "unsafe"
) )
@ -819,10 +818,10 @@ func traceback1(pc, sp, lr uintptr, gp *g, flags uint) {
// concurrently with a signal handler. // concurrently with a signal handler.
// We just have to stop a signal handler from interrupting // We just have to stop a signal handler from interrupting
// in the middle of our copy. // in the middle of our copy.
atomic.Store(&gp.m.cgoCallersUse, 1) gp.m.cgoCallersUse.Store(1)
cgoCallers := *gp.m.cgoCallers cgoCallers := *gp.m.cgoCallers
gp.m.cgoCallers[0] = 0 gp.m.cgoCallers[0] = 0
atomic.Store(&gp.m.cgoCallersUse, 0) gp.m.cgoCallersUse.Store(0)
printCgoTraceback(&cgoCallers) printCgoTraceback(&cgoCallers)
} }