From ff71ed86b6f7d39368a9a276087477c9cb3f9ff7 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 2 Mar 2016 17:27:59 -0500 Subject: [PATCH] runtime: merge {bgMark,assist}StartTime We used to start background mark workers and assists at different times, so we needed to keep track of these separately. They're now set to exactly the same time, so clean things up by merging them in to one value, markStartTime. Change-Id: I17c9843c3ed2d6f07b4c8cd0b2c438fc6de23b53 Reviewed-on: https://go-review.googlesource.com/20143 Run-TryBot: Austin Clements TryBot-Result: Gobot Gobot Reviewed-by: Rick Hudson --- src/runtime/mgc.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index e9d420f0f0..a8f460b428 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -340,13 +340,9 @@ type gcControllerState struct { // the cycle. idleMarkTime int64 - // bgMarkStartTime is the absolute start time in nanoseconds - // that the background mark phase started. - bgMarkStartTime int64 - - // assistTime is the absolute start time in nanoseconds that - // mutator assists were enabled. - assistStartTime int64 + // markStartTime is the absolute start time in nanoseconds + // that assists and background mark workers started. + markStartTime int64 // heapGoal is the goal memstats.heap_live for when this cycle // ends. This is computed at the beginning of each cycle. @@ -542,7 +538,7 @@ func (c *gcControllerState) endCycle() { // technically isn't comparable to the trigger ratio. goalGrowthRatio := float64(gcpercent) / 100 actualGrowthRatio := float64(memstats.heap_live)/float64(memstats.heap_marked) - 1 - assistDuration := nanotime() - c.assistStartTime + assistDuration := nanotime() - c.markStartTime // Assume background mark hit its utilization goal. utilization := gcGoalUtilization @@ -700,7 +696,7 @@ func (c *gcControllerState) findRunnableGCWorker(_p_ *p) *g { // TODO(austin): Shorter preemption interval for mark // worker to improve fairness and give this // finer-grained control over schedule? - now := nanotime() - gcController.bgMarkStartTime + now := nanotime() - gcController.markStartTime then := now + gcForcePreemptNS timeUsed := c.fractionalMarkTime + gcForcePreemptNS if then > 0 && float64(timeUsed)/float64(then) > c.fractionalUtilizationGoal { @@ -1002,8 +998,7 @@ func gcStart(mode gcMode, forceTrigger bool) { // Assists and workers can start the moment we start // the world. - gcController.assistStartTime = now - gcController.bgMarkStartTime = now + gcController.markStartTime = now // Concurrent mark. systemstack(startTheWorldWithSema) -- 2.48.1