interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

eth/downloader: use count instead of peers, clearer

This commit is contained in:
Péter Szilágyi 2015-05-11 17:06:42 +03:00 committed by obscuren
parent d37a2559b9
commit 064cf16099
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eth/downloader/downloader.go
View File

@ -363,7 +363,7 @@ out:
} }
} }
// After removing bad peers make sure we actually have sufficient peer left to keep downloading // After removing bad peers make sure we actually have sufficient peer left to keep downloading
if d.peers.Peers() == 0 { if d.peers.Len() == 0 {
d.queue.Reset() d.queue.Reset()
return errNoPeers return errNoPeers
} }
@ -400,7 +400,7 @@ out:
if d.queue.InFlight() == 0 { if d.queue.InFlight() == 0 {
d.queue.Reset() d.queue.Reset()
return fmt.Errorf("%v peers available = %d. total peers = %d. hashes needed = %d", errPeersUnavailable, len(idlePeers), d.peers.Peers(), d.queue.Pending()) return fmt.Errorf("%v peers available = %d. total peers = %d. hashes needed = %d", errPeersUnavailable, len(idlePeers), d.peers.Len(), d.queue.Pending())
} }
} else if d.queue.InFlight() == 0 { } else if d.queue.InFlight() == 0 {

4
eth/downloader/peer.go
View File

@ -154,8 +154,8 @@ func (ps *peerSet) Peer(id string) *peer {
return ps.peers[id] return ps.peers[id]
} }
// Peers returns if the current number of peers in the set. // Len returns if the current number of peers in the set.
func (ps *peerSet) Peers() int { func (ps *peerSet) Len() int {
ps.lock.RLock() ps.lock.RLock()
defer ps.lock.RUnlock() defer ps.lock.RUnlock()