mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-22 03:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

p2p: fix discovery shutdown (#8725) - alternative fix (#8757)

Browse Source 
Making the addReplyMatcher channel unbuffered makes the loop
going too slow sometimes for serving parallel requests.
This is an alternative fix for keeping the channel buffered.
This commit is contained in:
battlmonstr 2023-11-17 11:02:28 +01:00 committed by GitHub
parent fdab99d0e8
commit a5ff524740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
p2p/discover/v4_udp.go
View File

@ -83,7 +83,9 @@ type UDPv4 struct {
closeOnce sync.Once
wg sync.WaitGroup
addReplyMatcher chan *replyMatcher
addReplyMatcher chan *replyMatcher
addReplyMatcherMutex sync.Mutex
gotreply chan reply
gotkey chan v4wire.Pubkey
gotnodes chan nodes
@ -160,7 +162,7 @@ func ListenV4(ctx context.Context, protocol string, c UDPConn, ln *enode.LocalNo
localNode: ln,
db: ln.Database(),
gotreply: make(chan reply, 10),
addReplyMatcher: make(chan *replyMatcher),
addReplyMatcher: make(chan *replyMatcher, 10),
gotkey: make(chan v4wire.Pubkey, 10),
gotnodes: make(chan nodes, 10),
replyTimeout: cfg.ReplyTimeout,
@ -456,6 +458,13 @@ func (t *UDPv4) pending(id enode.ID, ip net.IP, port int, ptype byte, callback r
ch := make(chan error, 1)
p := &replyMatcher{from: id, ip: ip, port: port, ptype: ptype, callback: callback, errc: ch}
t.addReplyMatcherMutex.Lock()
defer t.addReplyMatcherMutex.Unlock()
if t.addReplyMatcher == nil {
ch <- errClosed
return p
}
select {
case t.addReplyMatcher <- p:
// loop will handle it
@ -582,6 +591,14 @@ func (t *UDPv4) loop() {
el.Value.(*replyMatcher).errc <- errClosed
}
}()
t.addReplyMatcherMutex.Lock()
defer t.addReplyMatcherMutex.Unlock()
close(t.addReplyMatcher)
for matcher := range t.addReplyMatcher {
matcher.errc <- errClosed
}
t.addReplyMatcher = nil
return
case p := <-t.addReplyMatcher: