diff options
| author | Bryan C. Mills <bcmills@google.com> | 2021-11-02 15:38:47 +0000 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2021-11-02 16:15:22 +0000 |
| commit | c6a0b6f2de9a778b03a29c656531617a606761f0 (patch) | |
| tree | 51a1b71ac19cbcd9f8902cabe4175cab70d9c54b /src/runtime/proc.go | |
| parent | f801da7855d3a82cc415279262e6b1ca7df39e5f (diff) | |
| download | go-c6a0b6f2de9a778b03a29c656531617a606761f0.tar.gz go-c6a0b6f2de9a778b03a29c656531617a606761f0.zip | |
Revert "runtime: fix missing pprof labels"
This reverts CL 351751.
Reason for revert: new test is failing on many builders.
Change-Id: I066211c9f25607ca9eb5299aedea2ecc5069e34f
Reviewed-on: https://go-review.googlesource.com/c/go/+/360757
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Pratt <mpratt@google.com>
Diffstat (limited to 'src/runtime/proc.go')
| -rw-r--r-- | src/runtime/proc.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 268d5ff398..bf5fa8e4fc 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -4711,14 +4711,7 @@ func sigprof(pc, sp, lr uintptr, gp *g, mp *m) { } if prof.hz != 0 { - // Note: it can happen on Windows that we interrupted a system thread - // with no g, so gp could nil. The other nil checks are done out of - // caution, but not expected to be nil in practice. - var tagPtr *unsafe.Pointer - if gp != nil && gp.m != nil && gp.m.curg != nil { - tagPtr = &gp.m.curg.labels - } - cpuprof.add(tagPtr, stk[:n]) + cpuprof.add(gp, stk[:n]) } getg().m.mallocing-- } |