github/smux
4
0
Fork 0
mirror of https://github.com/xtaci/smux.git synced 2024-04-21 10:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace d.Sub(time.Now()) with time.Until(d)

Browse Source
This commit is contained in:
Artyom Pervukhin
2017-12-13 12:00:10 +03:00
parent ebec7ef257
commit 99d8597e59
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
session.go
+1 -1
View File
@@ -118,7 +118,7 @@ func (s *Session) OpenStream() (*Stream, error) {
func (s *Session) AcceptStream() (*Stream, error) {
var deadline <-chan time.Time
if d, ok := s.deadline.Load().(time.Time); ok && !d.IsZero() {
timer := time.NewTimer(d.Sub(time.Now()))
timer := time.NewTimer(time.Until(d))
defer timer.Stop()
deadline = timer.C
}
stream.go
+2 -2
View File
@@ -46,7 +46,7 @@ func (s *Stream) ID() uint32 {
func (s *Stream) Read(b []byte) (n int, err error) {
var deadline <-chan time.Time
if d, ok := s.readDeadline.Load().(time.Time); ok && !d.IsZero() {
timer := time.NewTimer(d.Sub(time.Now()))
timer := time.NewTimer(time.Until(d))
defer timer.Stop()
deadline = timer.C
}
@@ -78,7 +78,7 @@ READ:
func (s *Stream) Write(b []byte) (n int, err error) {
var deadline <-chan time.Time
if d, ok := s.writeDeadline.Load().(time.Time); ok && !d.IsZero() {
timer := time.NewTimer(d.Sub(time.Now()))
timer := time.NewTimer(time.Until(d))
defer timer.Stop()
deadline = timer.C
}