udpate peers lock

wanchain · Jul 25, 2019 · 7f0785b · 7f0785b
1 parent b676e37
commit 7f0785b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/eth/handler.go b/eth/handler.go
@@ -800,8 +800,8 @@ func (pm *ProtocolManager) sendBufferTxsLoop() {
 	for {
 		select {
 		case <-tick.C:
-
-			for _, p := range pm.peers.peers {
+			peers := pm.peers.PeersList()
+			for _, p := range peers {
 
 				size := p.bufferTxs.Size()
 				if size > 0 {

diff --git a/eth/peer.go b/eth/peer.go
@@ -462,6 +462,16 @@ func (ps *peerSet) PeersWithoutTx(hash common.Hash) []*peer {
 	return list
 }
 
+func (ps *peerSet) PeersList() []*peer {
+	ps.lock.RLock()
+	defer ps.lock.RUnlock()
+
+	list := make([]*peer, 0, len(ps.peers))
+	for _, p := range ps.peers {
+		list = append(list, p)
+	}
+	return list
+}
 // BestPeer retrieves the known peer with the currently highest total difficulty.
 func (ps *peerSet) BestPeer() *peer {
 	ps.lock.RLock()