From: Ian Lance Taylor Date: Wed, 29 Jun 2016 00:23:01 +0000 (-0700) Subject: runtime: correct printing of blocked field in scheduler trace X-Git-Tag: go1.7rc1~28 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=25a609556aff7700c864f2dc69be01652fd801ab;p=gostls13.git runtime: correct printing of blocked field in scheduler trace When the blocked field was first introduced back in https://golang.org/cl/61250043 the scheduler trace code incorrectly used m->blocked instead of mp->blocked. That has carried through the conversion to Go. This CL fixes it. Change-Id: Id81907b625221895aa5c85b9853f7c185efd8f4b Reviewed-on: https://go-review.googlesource.com/24571 Reviewed-by: Brad Fitzpatrick --- diff --git a/src/runtime/proc.go b/src/runtime/proc.go index a0fddd0052..2c0b3df167 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -3826,7 +3826,7 @@ func schedtrace(detailed bool) { if lockedg != nil { id3 = lockedg.goid } - print(" M", mp.id, ": p=", id1, " curg=", id2, " mallocing=", mp.mallocing, " throwing=", mp.throwing, " preemptoff=", mp.preemptoff, ""+" locks=", mp.locks, " dying=", mp.dying, " helpgc=", mp.helpgc, " spinning=", mp.spinning, " blocked=", getg().m.blocked, " lockedg=", id3, "\n") + print(" M", mp.id, ": p=", id1, " curg=", id2, " mallocing=", mp.mallocing, " throwing=", mp.throwing, " preemptoff=", mp.preemptoff, ""+" locks=", mp.locks, " dying=", mp.dying, " helpgc=", mp.helpgc, " spinning=", mp.spinning, " blocked=", mp.blocked, " lockedg=", id3, "\n") } lock(&allglock)