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: Renames and comments

Browse source
This commit is contained in:
lash 2018-12-20 11:24:18 +01:00
parent 04a3cffc78
commit d45b0c4834
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
swarm/network/kademlia.go
View file

@ -451,7 +451,11 @@ func depthForPot(p *pot.Pot, minProxBinSize int, pivotAddr []byte) (depth int) {
// total number of peers in iteration // total number of peers in iteration
var size int var size int
// determining the depth is a two-step process
// first we find the proximity bin of the shallowest of the MinProxBinSize peers
// the numeric value of depth cannot be higher than this
var maxDepth int var maxDepth int
f := func(v pot.Val, i int) bool { f := func(v pot.Val, i int) bool {
// po == 256 means that addr is the pivot address(self) // po == 256 means that addr is the pivot address(self)
if i == 256 { if i == 256 {
@ -470,6 +474,9 @@ func depthForPot(p *pot.Pot, minProxBinSize int, pivotAddr []byte) (depth int) {
} }
p.EachNeighbour(pivotAddr, Pof, f) p.EachNeighbour(pivotAddr, Pof, f)
// the second step is to start from the top and test for empty bins
// if an empty bin is found, this will be the actual depth
// we stop iterating if we hit the maxDepth determined in the first step
p.EachBin(pivotAddr, Pof, 0, func(po int, _ int, f func(func(pot.Val, int) bool) bool) bool { p.EachBin(pivotAddr, Pof, 0, func(po int, _ int, f func(func(pot.Val, int) bool) bool) bool {
if po == depth { if po == depth {
if maxDepth == depth { if maxDepth == depth {
@ -751,18 +758,23 @@ func (k *Kademlia) connectedNeighbours(peers [][]byte) (got bool, n int, missing
// Health state of the Kademlia // Health state of the Kademlia
// used for testing only // used for testing only
type Health struct { type Health struct {
KnowNN bool // whether node knows all its nearest neighbours KnowNN bool // whether node knows all its neighbours
CountKnowNN int // amount of nearest neighbors connected to CountKnowNN int // amount of neighbors known
CulpritsKnowNN [][]byte // which known NNs are missing MissingKnowNN [][]byte // which neighbours we should have known but we don't
ConnectNN bool // whether node is connected to all its nearest neighbours ConnectNN bool // whether node is connected to all its neighbours
CountConnectNN int // amount of nearest neighbors connected to CountConnectNN int // amount of neighbours connected to
CulpritsConnectNN [][]byte // which known NNs are missing MissingConnectNN [][]byte // which neighbours we should have been connected to but we're not
Saturated bool // whether we have all the peers we'd like to have Saturated bool // whether we are connected to all the peers we would have liked to
Hive string Hive string
} }
// Healthy reports the health state of the kademlia connectivity // Healthy reports the health state of the kademlia connectivity
// returns a Health struct //
// The PeerPot argument provides an all-knowing view of the network
// The resulting Health object is a result of comparisons between
// what is the actual composition of the kademlia in question (the receiver), and
// what SHOULD it have been when we take all we know about the network into consideration.
//
// used for testing only // used for testing only
func (k *Kademlia) Healthy(pp *PeerPot) *Health { func (k *Kademlia) Healthy(pp *PeerPot) *Health {
k.lock.RLock() k.lock.RLock()
@ -775,10 +787,10 @@ func (k *Kademlia) Healthy(pp *PeerPot) *Health {
return &Health{ return &Health{
KnowNN: knownn, KnowNN: knownn,
CountKnowNN: countknownn, CountKnowNN: countknownn,
CulpritsKnowNN: culpritsknownn, MissingKnowNN: culpritsknownn,
ConnectNN: gotnn, ConnectNN: gotnn,
CountConnectNN: countgotnn, CountConnectNN: countgotnn,
CulpritsConnectNN: culpritsgotnn, MissingConnectNN: culpritsgotnn,
Saturated: saturated, Saturated: saturated,
Hive: k.string(), Hive: k.string(),
} }