make Peer.Info lock-free

This commit is contained in:
Matthias Radestock committed 2015-05-11 17:19:46 +01:00
1 parent 426d8edb31
commit c210f0e3c1
3 files changed
+8 -3

No files matched your search

+6
View File
@@ -75,6 +75,12 @@ func (peer *LocalPeer) RelayBroadcast(srcPeer *Peer, df bool, frame []byte, dec
}
}
func (peer *LocalPeer) Info() string {
peer.RLock()
defer peer.RUnlock()
return peer.Peer.Info()
}
func (peer *LocalPeer) Connections() ConnectionSet {
connections := make(ConnectionSet)
peer.RLock()
-2
View File
@@ -37,8 +37,6 @@ func (peer *Peer) String() string {
}
func (peer *Peer) Info() string {
peer.RLock()
defer peer.RUnlock()
return fmt.Sprint(peer.String(), " (v", peer.version, ") (UID ", peer.UID, ")")
}
+2 -1
View File
@@ -160,12 +160,13 @@ func (peers *Peers) String() string {
fmt.Fprintf(&buf, " -> %s [%v%s]\n", conn.Remote(), conn.RemoteTCPAddr(), established)
}
peers.ForEach(func(peer *Peer) {
fmt.Fprintln(&buf, peer.Info())
if peer == peers.ourself.Peer {
fmt.Fprintln(&buf, peers.ourself.Info())
for conn := range peers.ourself.Connections() {
printConnection(conn)
}
} else {
fmt.Fprintln(&buf, peer.Info())
// Modifying peer.connections requires a write lock on
// Peers, and since we are holding a read lock (due to the
// ForEach), access without locking the peer is safe.