diff options
| author | Ian Lance Taylor <iant@golang.org> | 2017-02-10 14:59:38 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2017-02-13 18:36:28 +0000 |
| commit | 3792db518327c685da17ca6c6faa4e1d2da4c33c (patch) | |
| tree | 8d2456fa679526c8349a968aaf3cae09524aadfd /src/net/dial.go | |
| parent | b548eee3d96fc0b6e962a243b28121e1f37ad792 (diff) | |
| download | go-3792db518327c685da17ca6c6faa4e1d2da4c33c.tar.xz | |
net: refactor poller into new internal/poll package
This will make it possible to use the poller with the os package.
This is a lot of code movement but the behavior is intended to be
unchanged.
Update #6817.
Update #7903.
Update #15021.
Update #18507.
Change-Id: I1413685928017c32df5654ded73a2643820977ae
Reviewed-on: https://go-review.googlesource.com/36799
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/net/dial.go')
| -rw-r--r-- | src/net/dial.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/dial.go b/src/net/dial.go index 50bba5a49e..0a7da408fe 100644 --- a/src/net/dial.go +++ b/src/net/dial.go @@ -7,6 +7,7 @@ package net import ( "context" "internal/nettrace" + "internal/poll" "time" ) @@ -110,7 +111,7 @@ func partialDeadline(now, deadline time.Time, addrsRemaining int) (time.Time, er } timeRemaining := deadline.Sub(now) if timeRemaining <= 0 { - return time.Time{}, errTimeout + return time.Time{}, poll.ErrTimeout } // Tentatively allocate equal time to each remaining address. timeout := timeRemaining / time.Duration(addrsRemaining) |