diff options
| author | doujiang24 <doujiang24@gmail.com> | 2022-08-12 02:28:43 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-08-12 18:26:31 +0000 |
| commit | ea9c3fd42d94182ce6f87104b68a51ea92f1a571 (patch) | |
| tree | 69fc24984a0e72e657d99f4c69b83cd7b53309f6 /src/runtime/proc.go | |
| parent | b6f87b0755f9705ce7d1c11c1b5354e8400ca7aa (diff) | |
| download | go-ea9c3fd42d94182ce6f87104b68a51ea92f1a571.tar.xz | |
runtime/trace: add missing events for the locked g in extra M.
Extra Ms may lead to the "no consistent ordering of events possible" error when parsing trace file with cgo enabled, since:
1. The gs in the extra Ms may be in `_Gdead` status while starting trace by invoking `runtime.StartTrace`,
2. and these gs will trigger `traceEvGoSysExit` events in `runtime.exitsyscall` when invoking go functions from c,
3. then, the events of those gs are under non-consistent ordering, due to missing the previous events.
Add two events, `traceEvGoCreate` and `traceEvGoInSyscall`, in `runtime.StartTrace`, will make the trace parser happy.
Fixes #29707
Change-Id: I7cc4b80822d2c46591304a59c9da2c9fc470f1d0
GitHub-Last-Rev: 445de8eaf3fb54e12795ac31e26650f821c5efbc
GitHub-Pull-Request: golang/go#53284
Reviewed-on: https://go-review.googlesource.com/c/go/+/411034
Run-TryBot: Michael Pratt <mpratt@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <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, 9 insertions, 0 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index a112c1b80c..9a7bd941db 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -1917,6 +1917,7 @@ func oneNewExtraM() { casgstatus(gp, _Gidle, _Gdead) gp.m = mp mp.curg = gp + mp.isextra = true mp.lockedInt++ mp.lockedg.set(gp) gp.lockedm.set(mp) @@ -1924,6 +1925,14 @@ func oneNewExtraM() { if raceenabled { gp.racectx = racegostart(abi.FuncPCABIInternal(newextram) + sys.PCQuantum) } + if trace.enabled { + // trigger two trace events for the locked g in the extra m, + // since the next event of the g will be traceEvGoSysExit in exitsyscall, + // while calling from C thread to Go. + traceGoCreate(gp, 0) // no start pc + gp.traceseq++ + traceEvent(traceEvGoInSyscall, -1, gp.goid) + } // put on allg for garbage collector allgadd(gp) |