p2p/enode: use per-source timeout in FairMix.Next

p2p/enode/iter.go

@@ -207,28 +207,32 @@ func (m *FairMix) Close() {
 // Next returns a node from a random source.
 func (m *FairMix) Next() bool {
 	m.cur = nil
-
-	var timeout <-chan time.Time
-	if m.timeout >= 0 {
-		timer := time.NewTimer(m.timeout)
-		timeout = timer.C
-		defer timer.Stop()
-	}
 	for {
 		source := m.pickSource()
 		if source == nil {
 			return m.nextFromAny()
 		}
+		var timeout <-chan time.Time
+		if source.timeout >= 0 {
+			timer := time.NewTimer(source.timeout)
+			timeout = timer.C
+			defer timer.Stop()
+		}
 		select {
 		case n, ok := <-source.next:
 			if ok {
-				m.cur = n
+				// Here, the timeout is reset to the configured value
+				// because the source delivered a node.
 				source.timeout = m.timeout
+				m.cur = n
 				return true
 			}
 			// This source has ended.
 			m.deleteSource(source)
 		case <-timeout:
+			// The selected source did not deliver a node within the timeout, so the
+			// timeout duration is halved for next time. This is supposed to improve
+			// latency with stuck sources.
 			source.timeout /= 2
 			return m.nextFromAny()
 		}