From fc086dcd8076f84d83e26a6121960dad822c157c Mon Sep 17 00:00:00 2001 From: Ferenc Szabo Date: Fri, 14 Dec 2018 14:16:36 +0100 Subject: [PATCH] p2p/simulations: use RLock where possible --- p2p/simulations/network.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 9e6e6c8763..aa9ec60fdc 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -373,16 +373,16 @@ func (net *Network) DidReceive(sender, receiver enode.ID, proto string, code uin // GetNode gets the node with the given ID, returning nil if the node does not // exist func (net *Network) GetNode(id enode.ID) *Node { - net.lock.Lock() - defer net.lock.Unlock() + net.lock.RLock() + defer net.lock.RUnlock() return net.getNode(id) } // GetNode gets the node with the given name, returning nil if the node does // not exist func (net *Network) GetNodeByName(name string) *Node { - net.lock.Lock() - defer net.lock.Unlock() + net.lock.RLock() + defer net.lock.RUnlock() return net.getNodeByName(name) } @@ -397,8 +397,8 @@ func (net *Network) getNodeByName(name string) *Node { // GetNodes returns the existing nodes func (net *Network) GetNodes() (nodes []*Node) { - net.lock.Lock() - defer net.lock.Unlock() + net.lock.RLock() + defer net.lock.RUnlock() nodes = append(nodes, net.Nodes...) return nodes @@ -471,8 +471,8 @@ func filterIDs(ids []enode.ID, excludeIDs []enode.ID) []enode.ID { // GetConn returns the connection which exists between "one" and "other" // regardless of which node initiated the connection func (net *Network) GetConn(oneID, otherID enode.ID) *Conn { - net.lock.Lock() - defer net.lock.Unlock() + net.lock.RLock() + defer net.lock.RUnlock() return net.getConn(oneID, otherID) }