internal: drain channel when stopping timer (#165)

SiaFoundation · Jun 7, 2024 · b6076d9 · b6076d9
1 parent 3563813
commit b6076d9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/internal/smux/session.go b/internal/smux/session.go
@@ -29,7 +29,14 @@ func (tm *tryMutex) TryLock(t time.Duration) bool {
 	default:
 	}
 	timer := time.NewTimer(t)
-	defer timer.Stop()
+	defer func() {
+		if !timer.Stop() {
+			select {
+			case <-timer.C:
+			default:
+			}
+		}
+	}()
 	select {
 	case <-tm.lock:
 		return true
@@ -149,7 +156,14 @@ 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(time.Until(d))
-		defer timer.Stop()
+		defer func() {
+			if !timer.Stop() {
+				select {
+				case <-timer.C:
+				default:
+				}
+			}
+		}()
 		deadline = timer.C
 	}
 	select {

diff --git a/internal/smux/stream.go b/internal/smux/stream.go
@@ -45,7 +45,14 @@ 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(time.Until(d))
-		defer timer.Stop()
+		defer func() {
+			if !timer.Stop() {
+				select {
+				case <-timer.C:
+				default:
+				}
+			}
+		}()
 		deadline = timer.C
 	}