Skip to content

Commit

Permalink
runtime: fix unclosed GCSweepStart trace event
Browse files Browse the repository at this point in the history
CL 333389 erroneously moved traceGCSweepDone inside the sl.valid block
that it introduced in mcentral.cacheSpan, when it should have left it
outside that scope, because the trace event is created unconditionally
at the top of the method.

Fixes #49231.

Change-Id: If719c05063d4f4d330a320da6dc00d1e9d8102e4
Reviewed-on: https://go-review.googlesource.com/c/go/+/359775
Trust: Michael Knyszek <mknyszek@google.com>
Run-TryBot: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
  • Loading branch information
mknyszek committed Oct 29, 2021
1 parent 413672f commit 903f313
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/runtime/mcentral.go
Expand Up @@ -154,10 +154,10 @@ func (c *mcentral) cacheSpan() *mspan {
// See comment for partial unswept spans.
}
sweep.active.end(sl)
if trace.enabled {
traceGCSweepDone()
traceDone = true
}
}
if trace.enabled {
traceGCSweepDone()
traceDone = true
}

// We failed to get a span from the mcentral so get one from mheap.
Expand Down

0 comments on commit 903f313

Please sign in to comment.