languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-05 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

runtime: convert prof.signalLock to atomic type

Browse source 
For #53821.

Change-Id: I3e757fc6a020be10ee69459c395cb7eee49b0dfb
Reviewed-on: https://go-review.googlesource.com/c/go/+/420195
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
This commit is contained in:
Michael Pratt 2022-07-29 14:52:42 -04:00
parent b04e4637db
commit 3121c2bf64
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/runtime/cpuprof.go
View file

@ -14,7 +14,6 @@ package runtime
import (
"internal/abi"
"runtime/internal/atomic"
"runtime/internal/sys"
"unsafe"
)
@ -106,7 +105,7 @@ func SetCPUProfileRate(hz int) {
//go:nowritebarrierrec
func (p *cpuProfile) add(tagPtr *unsafe.Pointer, stk []uintptr) {
// Simple cas-lock to coordinate with setcpuprofilerate.
for !atomic.Cas(&prof.signalLock, 0, 1) {
for !prof.signalLock.CompareAndSwap(0, 1) {
// TODO: Is it safe to osyield here? https://go.dev/issue/52672
osyield()
}
@ -123,7 +122,7 @@ func (p *cpuProfile) add(tagPtr *unsafe.Pointer, stk []uintptr) {
cpuprof.log.write(tagPtr, nanotime(), hdr[:], stk)
}
atomic.Store(&prof.signalLock, 0)
prof.signalLock.Store(0)
}
// addNonGo adds the non-Go stack trace to the profile.
@ -143,7 +142,7 @@ func (p *cpuProfile) addNonGo(stk []uintptr) {
// process at a time. If not, this lock will serialize those too.
// The use of timer_create(2) on Linux to request process-targeted
// signals may have changed this.)
for !atomic.Cas(&prof.signalLock, 0, 1) {
for !prof.signalLock.CompareAndSwap(0, 1) {
// TODO: Is it safe to osyield here? https://go.dev/issue/52672
osyield()
}
@ -157,7 +156,7 @@ func (p *cpuProfile) addNonGo(stk []uintptr) {
cpuprof.lostExtra++
}
atomic.Store(&prof.signalLock, 0)
prof.signalLock.Store(0)
}
// addExtra adds the "extra" profiling events,

6
src/runtime/proc.go
View file

@ -4474,7 +4474,7 @@ func mcount() int32 {
}
var prof struct {
signalLock uint32
signalLock atomic.Uint32
hz int32
}
@ -4628,14 +4628,14 @@ func setcpuprofilerate(hz int32) {
// it would deadlock.
setThreadCPUProfiler(0)
for !atomic.Cas(&prof.signalLock, 0, 1) {
for !prof.signalLock.CompareAndSwap(0, 1) {
osyield()
}
if prof.hz != hz {
setProcessCPUProfiler(hz)
prof.hz = hz
}
atomic.Store(&prof.signalLock, 0)
prof.signalLock.Store(0)
lock(&sched.lock)
sched.profilehz = hz