forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/network: renamed to isSaturated and returns bool

Browse source
This commit is contained in:
Fabio Barone 2019-02-12 09:52:04 -05:00
parent 627d06182e
commit d0ca8b1c3a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
swarm/network/kademlia.go
View file

@ -701,13 +701,14 @@ func (k *Kademlia) saturation() int {
return prev return prev
} }
// getUnsaturatedBins returns an array of ints; each item in that array corresponds // isSaturated returns true if the kademlia is considered saturated, or false if not.
// It checks this by checking an array of ints called unsaturatedBins; each item in that array corresponds
// to the bin which is unsaturated (number of connections < k.MinBinSize). // to the bin which is unsaturated (number of connections < k.MinBinSize).
// The bin is considered unsaturated only if there are actual peers in that PeerPot's bin (peersPerBin) // The bin is considered unsaturated only if there are actual peers in that PeerPot's bin (peersPerBin)
// (if there is no peer for a given bin, then no connection could ever be established; // (if there is no peer for a given bin, then no connection could ever be established;
// in a God's view this is relevant as no more peers will ever appear on that bin) // in a God's view this is relevant as no more peers will ever appear on that bin)
func (k *Kademlia) getUnsaturatedBins(peersPerBin []int, depth int) []int { func (k *Kademlia) isSaturated(peersPerBin []int, depth int) bool {
// depth could be calculated from k but as this is called from `Healthy()`, // depth could be calculated from k but as this is called from `GetHealthInfo()`,
// the depth has already been calculated so we can require it as a parameter // the depth has already been calculated so we can require it as a parameter
unsaturatedBins := make([]int, 0) unsaturatedBins := make([]int, 0)
k.conns.EachBin(k.base, Pof, 0, func(po, size int, f func(func(val pot.Val) bool) bool) bool { k.conns.EachBin(k.base, Pof, 0, func(po, size int, f func(func(val pot.Val) bool) bool) bool {
@ -725,7 +726,11 @@ func (k *Kademlia) getUnsaturatedBins(peersPerBin []int, depth int) []int {
}) })
log.Trace("list of unsaturated bins", "unsaturatedBins", unsaturatedBins) log.Trace("list of unsaturated bins", "unsaturatedBins", unsaturatedBins)
return unsaturatedBins // early check for depth
if depth != len(peersPerBin) {
return false
}
return len(unsaturatedBins) == 0
} }
// knowNeighbours tests if all neighbours in the peerpot // knowNeighbours tests if all neighbours in the peerpot
@ -835,8 +840,7 @@ func (k *Kademlia) GetHealthInfo(pp *PeerPot) *Health {
depth := depthForPot(k.conns, k.NeighbourhoodSize, k.base) depth := depthForPot(k.conns, k.NeighbourhoodSize, k.base)
// check saturation // check saturation
unsaturatedBins := k.getUnsaturatedBins(pp.PeersPerBin, depth) saturated := k.isSaturated(pp.PeersPerBin, depth)
saturated := depth == len(pp.PeersPerBin) && len(unsaturatedBins) == 0
log.Trace(fmt.Sprintf("%08x: healthy: knowNNs: %v, gotNNs: %v, saturated: %v\n", k.base, knownn, gotnn, saturated)) log.Trace(fmt.Sprintf("%08x: healthy: knowNNs: %v, gotNNs: %v, saturated: %v\n", k.base, knownn, gotnn, saturated))
return &Health{ return &Health{