common/clock/clockcontext.go - Issue 1679023005: Add Context cancellation to clock.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: common/clock/clockcontext.go

Issue 1679023005: Add Context cancellation to clock. (Closed) Base URL: https://github.com/luci/luci-go@master

Patch Set: Cleanup memlock, restore old determinism, better name. Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: common/clock/clockcontext.go

diff --git a/common/clock/clockcontext.go b/common/clock/clockcontext.go

index 979f2fc0588d02a29fc808553ff43742c9dbb640..1b9df12e35e83e0a6be23c9ece273f3e7f04fafd 100644

--- a/common/clock/clockcontext.go

+++ b/common/clock/clockcontext.go

@@ -71,11 +71,8 @@ func WithDeadline(parent context.Context, deadline time.Time) (context.Context,

// Invoke our cancelFunc after the specified time.

go func() {

- select {

- case <-c.Done():

- break

- case <-After(c, d):

+ if ar := <-After(c, d); ar.Err == nil {

+ // Timer expired naturally.

c.setError(context.DeadlineExceeded)

cancelFunc()

}