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

Merge branch 'stats'

This commit is contained in:
Ștefan Talpalaru 2019-06-26 15:41:37 +02:00
parent 07484bfc88 799b1a7bb0
commit 69de12e636
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eth/common/eth_types.nim
View File

@ -168,6 +168,9 @@ type
OK OK
Error Error
NimbusStats* = object
num_peers*: int
when BlockNumber is int64: when BlockNumber is int64:
## The goal of these templates is to make it easier to switch ## The goal of these templates is to make it easier to switch
## the block number type to a different representation ## the block number type to a different representation

2
eth/common/utils.nim
View File

@ -8,3 +8,5 @@ proc parseAddress*(hexString: string): EthAddress =
proc `$`*(a: EthAddress): string = proc `$`*(a: EthAddress): string =
a.toHex() a.toHex()
var nimbusStats*: NimbusStats

3
eth/p2p/peer_pool.nim
View File

@ -3,7 +3,7 @@
import import
os, tables, times, random, sequtils, options, os, tables, times, random, sequtils, options,
chronos, chronicles, eth/[rlp, keys], chronos, chronicles, eth/[rlp, keys, common],
private/p2p_types, discovery, kademlia, rlpx private/p2p_types, discovery, kademlia, rlpx
const const
@ -110,6 +110,7 @@ proc getRandomBootnode(p: PeerPool): Option[Node] =
proc addPeer*(pool: PeerPool, peer: Peer) = proc addPeer*(pool: PeerPool, peer: Peer) =
doAssert(peer.remote notin pool.connectedNodes) doAssert(peer.remote notin pool.connectedNodes)
pool.connectedNodes[peer.remote] = peer pool.connectedNodes[peer.remote] = peer
inc(nimbusStats.num_peers)
for o in pool.observers.values: for o in pool.observers.values:
if not o.onPeerConnected.isNil: if not o.onPeerConnected.isNil:
if o.protocol.isNil or peer.supports(o.protocol): if o.protocol.isNil or peer.supports(o.protocol):

3
eth/p2p/rlpx.nim
View File

@ -787,8 +787,9 @@ proc removePeer(network: EthereumNode, peer: Peer) =
# have been dropped already from the peers side. # have been dropped already from the peers side.
# E.g. when receiving a p2p.disconnect message from a peer, a race will happen # E.g. when receiving a p2p.disconnect message from a peer, a race will happen
# between which side disconnects first. # between which side disconnects first.
if network.peerPool != nil and not peer.remote.isNil: if network.peerPool != nil and not peer.remote.isNil and peer.remote in network.peerPool.connectedNodes:
network.peerPool.connectedNodes.del(peer.remote) network.peerPool.connectedNodes.del(peer.remote)
dec(nimbusStats.num_peers)
# Note: we need to do this check as disconnect (and thus removePeer) # Note: we need to do this check as disconnect (and thus removePeer)
# currently can get called before the dispatcher is initialized. # currently can get called before the dispatcher is initialized.