qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 07:04:43 -07:00
Code Releases Activity

runtime: generalize work.finalizersDone to work.markrootDone

Browse Source 
We're about to add another root marking job that needs to happen only
during the first markroot pass (whether that's concurrent or STW),
just like finalizer scanning. Rather than introducing another flag
that has the same value as finalizersDone, just rename finalizersDone
to markrootDone.

Change-Id: I535356c6ea1f3734cb5b6add264cb7bf48de95e8
Reviewed-on: https://go-review.googlesource.com/20043
Reviewed-by: Rick Hudson <rlh@golang.org>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Austin Clements 2016-02-15 18:24:06 -05:00
parent 276b177771
commit c14d25c648
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/runtime/mgc.go
View File

@ -755,11 +755,13 @@ var work struct {
// Number of roots of various root types. Set by gcMarkRootPrepare.
nDataRoots, nBSSRoots, nSpanRoots, nStackRoots int
// finalizersDone indicates that finalizers and objects with
// finalizers have been scanned by markroot. During concurrent
// GC, this happens during the concurrent scan phase. During
// STW GC, this happens during mark termination.
finalizersDone bool
// markrootDone indicates that roots have been marked at least
// once during the current GC cycle. This is checked by root
// marking operations that have to happen only during the
// first root marking pass, whether that's during the
// concurrent mark phase in current GC or mark termination in
// STW GC.
markrootDone bool
// Each type of GC state transition is protected by a lock.
// Since multiple threads can simultaneously detect the state
@ -1112,9 +1114,8 @@ top:
// below. The important thing is that the wb remains active until
// all marking is complete. This includes writes made by the GC.
// markroot is done now, so record that objects with
// finalizers have been scanned.
work.finalizersDone = true
// Record that one root marking pass has completed.
work.markrootDone = true
// Disable assists and background workers. We must do
// this before waking blocked assists.
@ -1573,9 +1574,8 @@ func gcMark(start_time int64) {
notesleep(&work.alldone)
}
// markroot is done now, so record that objects with
// finalizers have been scanned.
work.finalizersDone = true
// Record that at least one root marking pass has completed.
work.markrootDone = true
for i := 0; i < int(gomaxprocs); i++ {
if !allp[i].gcw.empty() {
@ -1745,7 +1745,7 @@ func gcResetMarkState() {
work.bytesMarked = 0
work.initialHeapLive = memstats.heap_live
work.finalizersDone = false
work.markrootDone = false
}
// Hooks for other packages

6
src/runtime/mgcmark.go
View File

@ -235,11 +235,11 @@ func markrootSpans(gcw *gcWork, shard int) {
// We process objects with finalizers only during the first
// markroot pass. In concurrent GC, this happens during
// concurrent scan and we depend on addfinalizer to ensure the
// concurrent mark and we depend on addfinalizer to ensure the
// above invariants for objects that get finalizers after
// concurrent scan. In STW GC, this will happen during mark
// concurrent mark. In STW GC, this will happen during mark
// termination.
if work.finalizersDone {
if work.markrootDone {
return
}