diff options
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/mgc.go | 7 | ||||
| -rw-r--r-- | src/runtime/proc.go | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index 111fa781e1..0e57d960c4 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -1308,8 +1308,9 @@ func gcStart(mode gcMode, trigger gcTrigger) { gcController.markStartTime = now // Concurrent mark. - systemstack(startTheWorldWithSema) - now = nanotime() + systemstack(func() { + now = startTheWorldWithSema() + }) work.pauseNS += now - work.pauseStart work.tMark = now } else { @@ -1573,7 +1574,7 @@ func gcMarkTermination(nextTriggerRatio float64) { // so events don't leak into the wrong cycle. mProf_NextCycle() - systemstack(startTheWorldWithSema) + systemstack(func() { startTheWorldWithSema() }) // Flush the heap profile so we can start a new cycle next GC. // This is relatively expensive, so we don't do it with the diff --git a/src/runtime/proc.go b/src/runtime/proc.go index ed333bb92e..cc1e30a925 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -941,7 +941,7 @@ func stopTheWorld(reason string) { // startTheWorld undoes the effects of stopTheWorld. func startTheWorld() { - systemstack(startTheWorldWithSema) + systemstack(func() { startTheWorldWithSema() }) // worldsema must be held over startTheWorldWithSema to ensure // gomaxprocs cannot change while worldsema is held. semrelease(&worldsema) @@ -1057,7 +1057,7 @@ func mhelpgc() { _g_.m.helpgc = -1 } -func startTheWorldWithSema() { +func startTheWorldWithSema() int64 { _g_ := getg() _g_.m.locks++ // disable preemption because it can be holding p in a local var @@ -1097,6 +1097,9 @@ func startTheWorldWithSema() { } } + // Capture start-the-world time before doing clean-up tasks. + startTime := nanotime() + // Wakeup an additional proc in case we have excessive runnable goroutines // in local queues or in the global queue. If we don't, the proc will park itself. // If we have lots of excessive work, resetspinning will unpark additional procs as necessary. @@ -1118,6 +1121,8 @@ func startTheWorldWithSema() { if _g_.m.locks == 0 && _g_.preempt { // restore the preemption request in case we've cleared it in newstack _g_.stackguard0 = stackPreempt } + + return startTime } // Called to start an M. |