roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

p2p: Cache inbound flag on Peer.isInbound to avoid a race

Browse Source
This commit is contained in:
Andrey Petrov 2018-06-07 10:42:40 -04:00
parent 399aa710d5
commit dcca66bce8
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
p2p/peer.go
View File

@ -96,6 +96,7 @@ type PeerEvent struct {
// Peer represents a connected remote node. // Peer represents a connected remote node.
type Peer struct { type Peer struct {
rw *conn rw *conn
isInbound bool // Cached from rw.flags to avoid a race condition
running map[string]*protoRW running map[string]*protoRW
log log.Logger log log.Logger
created mclock.AbsTime created mclock.AbsTime
@ -160,13 +161,14 @@ func (p *Peer) String() string {
// Inbound returns true if the peer is an inbound connection // Inbound returns true if the peer is an inbound connection
func (p *Peer) Inbound() bool { func (p *Peer) Inbound() bool {
return p.rw.flags&inboundConn != 0 return p.isInbound
} }
func newPeer(conn *conn, protocols []Protocol) *Peer { func newPeer(conn *conn, protocols []Protocol) *Peer {
protomap := matchProtocols(protocols, conn.caps, conn) protomap := matchProtocols(protocols, conn.caps, conn)
p := &Peer{ p := &Peer{
rw: conn, rw: conn,
isInbound: conn.is(inboundConn),
running: protomap, running: protomap,
created: mclock.Now(), created: mclock.Now(),
disc: make(chan DiscReason), disc: make(chan DiscReason),