diff options
| author | Chressie Himpel <chressie@google.com> | 2022-04-27 20:09:28 +0200 |
|---|---|---|
| committer | Chressie Himpel <chressie@google.com> | 2022-04-27 20:09:28 +0200 |
| commit | ec7f5165ddc680efbac18dc15b4905844d9e8db9 (patch) | |
| tree | eacc43345e3d6f0adfda16bfcf66e7e5096a85b9 /src/runtime/mgcsweep.go | |
| parent | ca6fd39cf6498d4507fc7cdaced55620c283a503 (diff) | |
| parent | f0ee7fda636408b4f04ca3f3b11788f662c90610 (diff) | |
| download | go-ec7f5165ddc680efbac18dc15b4905844d9e8db9.tar.gz go-ec7f5165ddc680efbac18dc15b4905844d9e8db9.zip | |
[dev.boringcrypto] all: merge master into dev.boringcrypto
Change-Id: Ic5f71c04f08c03319c043f35be501875adb0a3b0
Diffstat (limited to 'src/runtime/mgcsweep.go')
| -rw-r--r-- | src/runtime/mgcsweep.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/runtime/mgcsweep.go b/src/runtime/mgcsweep.go index d0b81fd3dfb..a5e04d6ce6d 100644 --- a/src/runtime/mgcsweep.go +++ b/src/runtime/mgcsweep.go @@ -263,7 +263,7 @@ func finishsweep_m() { // Sweeping is done, so if the scavenger isn't already awake, // wake it up. There's definitely work for it to do at this // point. - wakeScavenger() + scavenger.wake() nextMarkBitArenaEpoch() } @@ -403,10 +403,7 @@ func sweepone() uintptr { mheap_.pages.scavengeStartGen() unlock(&mheap_.lock) }) - // Since we might sweep in an allocation path, it's not possible - // for us to wake the scavenger directly via wakeScavenger, since - // it could allocate. Ask sysmon to do it for us instead. - readyForScavenger() + scavenger.ready() } gp.m.locks-- |