Skip to content

Commit

Permalink
p2p: move ping handling into pingLoop goroutine (ethereum#27887)
Browse files Browse the repository at this point in the history
Moving the response sending there allows tracking all peer goroutines
in the peer WaitGroup.

(cherry picked from commit 7ec60d5)
  • Loading branch information
fjl authored and jyap808 committed Mar 21, 2024
1 parent d97e131 commit 2384cb5
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions p2p/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ type Peer struct {
wg sync.WaitGroup
protoErr chan error
closed chan struct{}
pingRecv chan struct{}
disc chan DiscReason

// events receives message send / receive events if set
Expand Down Expand Up @@ -233,6 +234,7 @@ func newPeer(log log.Logger, conn *conn, protocols []Protocol) *Peer {
disc: make(chan DiscReason),
protoErr: make(chan error, len(protomap)+1), // protocols + pingLoop
closed: make(chan struct{}),
pingRecv: make(chan struct{}, 16),
log: log.New("id", conn.node.ID(), "conn", conn.flags),
}
return p
Expand Down Expand Up @@ -293,9 +295,11 @@ loop:
}

func (p *Peer) pingLoop() {
ping := time.NewTimer(pingInterval)
defer p.wg.Done()

ping := time.NewTimer(pingInterval)
defer ping.Stop()

for {
select {
case <-ping.C:
Expand All @@ -304,6 +308,10 @@ func (p *Peer) pingLoop() {
return
}
ping.Reset(pingInterval)

case <-p.pingRecv:
SendItems(p.rw, pongMsg)

case <-p.closed:
return
}
Expand All @@ -330,7 +338,10 @@ func (p *Peer) handle(msg Msg) error {
switch {
case msg.Code == pingMsg:
msg.Discard()
go SendItems(p.rw, pongMsg)
select {
case p.pingRecv <- struct{}{}:
case <-p.closed:
}
case msg.Code == discMsg:
// This is the last message. We don't need to discard or
// check errors because, the connection will be closed after it.
Expand Down

0 comments on commit 2384cb5

Please sign in to comment.