Skip to content

Commit d1cae63

Browse files
committed
runtime: fix check for pending GC work
When findRunnable considers running a fractional mark worker, it first checks if there's any work to be done; if there isn't there's no point in running the worker because it will just reschedule immediately. However, currently findRunnable just checks work.full and work.partial, whereas getfull can *also* draw work from m.currentwbuf. As a result, findRunnable may not start a worker even though there actually is work. This problem manifests itself in occasional failures of the test/init1.go test. This test is unusual because it performs a large amount of allocation without executing any write barriers, which means there's nothing to force the pointers in currentwbuf out to the work.partial/full lists where findRunnable can see them. This change fixes this problem by making findRunnable also check for a currentwbuf. This aligns findRunnable with trygetfull's notion of whether or not there's work. Change-Id: Ic76d22b7b5d040bc4f58a6b5975e9217650e66c4 Reviewed-on: https://go-review.googlesource.com/9299 Reviewed-by: Russ Cox <[email protected]>
1 parent 26eac91 commit d1cae63

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/runtime/mgc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ func (c *gcControllerState) findRunnable(_p_ *p) *g {
501501
// else for a while, so kick everything out of its run
502502
// queue.
503503
} else {
504-
if work.full == 0 && work.partial == 0 {
504+
if _p_.m.ptr().currentwbuf == 0 && work.full == 0 && work.partial == 0 {
505505
// No work to be done right now. This can
506506
// happen at the end of the mark phase when
507507
// there are still assists tapering off. Don't

0 commit comments

Comments
 (0)