mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: make ncgocall a global counter 

ncgocall was stored per M, runtime.NumCgoCall lost the counter when a M die.

Fixes #46789
This commit is contained in:
Tao Qingyun 2021-06-21 09:26:43 +08:00
parent fb1d285d41
commit cbc15fa870
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/debug.go
View File

@ -45,7 +45,7 @@ func NumCPU() int {
// NumCgoCall returns the number of cgo calls made by the current process. // NumCgoCall returns the number of cgo calls made by the current process.
func NumCgoCall() int64 { func NumCgoCall() int64 {
var n = int64(ncgocall) var n = int64(atomic.Load64(&ncgocall))
for mp := (*m)(atomic.Loadp(unsafe.Pointer(&allm))); mp != nil; mp = mp.alllink { for mp := (*m)(atomic.Loadp(unsafe.Pointer(&allm))); mp != nil; mp = mp.alllink {
n += int64(mp.ncgocall) n += int64(mp.ncgocall)
} }

3
src/runtime/proc.go
View File

@ -1507,7 +1507,6 @@ func mexit(osStack bool) {
} }
throw("m not found in allm") throw("m not found in allm")
found: found:
ncgocall += m.ncgocall
if !osStack { if !osStack {
// Delay reaping m until it's done with the stack. // Delay reaping m until it's done with the stack.
// //
@ -1523,6 +1522,8 @@ found:
} }
unlock(&sched.lock) unlock(&sched.lock)
atomic.Xadd64(&ncgocall, int64(m.ncgocall))
// Release the P. // Release the P.
handoffp(releasep()) handoffp(releasep())
// After this point we must not have write barriers. // After this point we must not have write barriers.