From e96fd132644953e762314c87922e217284499ca6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 30 Oct 2019 15:12:52 -0700 Subject: [PATCH] runtime: use correct state machine in addAdjustedTimers The addAdjustedTimers function was a late addition, and it got some of the state machine wrong, leading to failures like https://storage.googleapis.com/go-build-log/930576b6/windows-amd64-2016_53d0319e.log Updates #6239 Updates #27707 Change-Id: I9e94e563b4698ff3035ce609055ca292b9cab3df Reviewed-on: https://go-review.googlesource.com/c/go/+/204280 Run-TryBot: Ian Lance Taylor Reviewed-by: Michael Knyszek --- src/runtime/time.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/runtime/time.go b/src/runtime/time.go index db48a932d4..6c1170bbc0 100644 --- a/src/runtime/time.go +++ b/src/runtime/time.go @@ -989,10 +989,12 @@ func addAdjustedTimers(pp *p, moved []*timer) { case timerDeleted: // Timer has been deleted since we adjusted it. // This timer is already out of the heap. - if !atomic.Cas(&t.status, s, timerRemoved) { - badTimer() + if atomic.Cas(&t.status, s, timerRemoving) { + if !atomic.Cas(&t.status, timerRemoving, timerRemoved) { + badTimer() + } + break loop } - break loop case timerModifiedEarlier, timerModifiedLater: // Timer has been modified again since // we adjusted it. @@ -1007,8 +1009,8 @@ func addAdjustedTimers(pp *p, moved []*timer) { if s == timerModifiedEarlier { atomic.Xadd(&pp.adjustTimers, -1) } + break loop } - break loop case timerNoStatus, timerRunning, timerRemoving, timerRemoved, timerMoving: badTimer() case timerModifying: -- 2.50.0