status-im
/
nim-libp2p
mirror of https://github.com/status-im/nim-libp2p.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

getGossipPeers fixes

This commit is contained in:
Giovanni Petrantoni 2020-07-01 17:26:42 +09:00
parent a976c22dae
commit d9e0ca6091
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libp2p/protocols/pubsub/gossipsub.nim
View File

@ -178,6 +178,11 @@ proc dropFanoutPeers(g: GossipSub) {.async.} =
libp2p_gossipsub_peers_per_topic_fanout libp2p_gossipsub_peers_per_topic_fanout
.set(g.fanout.getOrDefault(topic).len.int64, labelValues = [topic]) .set(g.fanout.getOrDefault(topic).len.int64, labelValues = [topic])
proc shuffle[T](collection: var seq[T]) =
for i in 0..collection.high:
let r = rand(collection.high)
swap(collection[i], collection[r])
proc getGossipPeers(g: GossipSub): Table[string, ControlMessage] {.gcsafe.} = proc getGossipPeers(g: GossipSub): Table[string, ControlMessage] {.gcsafe.} =
## gossip iHave messages to peers ## gossip iHave messages to peers
let topics = toHashSet(toSeq(g.mesh.keys)) + toHashSet(toSeq(g.fanout.keys)) let topics = toHashSet(toSeq(g.mesh.keys)) + toHashSet(toSeq(g.fanout.keys))
@ -186,28 +191,22 @@ proc getGossipPeers(g: GossipSub): Table[string, ControlMessage] {.gcsafe.} =
let fanout: HashSet[string] = g.fanout.getOrDefault(topic) let fanout: HashSet[string] = g.fanout.getOrDefault(topic)
let gossipPeers = mesh + fanout let gossipPeers = mesh + fanout
var extraPeers = g.gossipsub # copy it!
let mids = g.mcache.window(topic) let mids = g.mcache.window(topic)
if mids.len > 0: if mids.len > 0:
let ihave = ControlIHave(topicID: topic, let ihave = ControlIHave(topicID: topic,
messageIDs: toSeq(mids)) messageIDs: toSeq(mids))
if topic notin extraPeers: if topic notin g.gossipsub:
trace "topic not in gossip array, skipping", topicID = topic trace "topic not in gossip array, skipping", topicID = topic
continue continue
while result.len < GossipSubD: var extraPeers = toSeq(g.gossipsub[topic])
if extraPeers.getOrDefault(topic).len == 0: shuffle(extraPeers)
trace "no peers for topic, skipping", topicID = topic for peer in extraPeers:
break if result.len < GossipSubD and
peer notin gossipPeers and
let id = toSeq(extraPeers.getOrDefault(topic)).sample() peer notin result:
if id in extraPeers.getOrDefault(topic): result[peer] = ControlMessage(ihave: @[ihave])
extraPeers[topic].excl(id)
if id notin gossipPeers:
if id notin result:
result[id] = ControlMessage()
result[id].ihave.add(ihave)
proc heartbeat(g: GossipSub) {.async.} = proc heartbeat(g: GossipSub) {.async.} =
while g.heartbeatRunning: while g.heartbeatRunning: