TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-12-23 23:25:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2738 from nspcc-dev/dont-block-forever-2

Browse source 
network: don't wait indefinitely for packet to be sent
This commit is contained in:
Roman Khimov 2022-10-11 19:40:10 +07:00 committed by GitHub
commit 0294e2eb18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/network/server.go
View file

@ -1385,7 +1385,7 @@ func (s *Server) iteratePeersWithSendMsg(msg *Message, send func(Peer, bool, []b
peer.AddGetAddrSent()
}
sentN++
} else if errors.Is(err, errBusy) {
} else if !blocking && errors.Is(err, errBusy) {
// Can be retried.
continue
} else {

11
pkg/network/tcp_peer.go
View file

@ -87,11 +87,18 @@ func (p *TCPPeer) putPacketIntoQueue(queue chan<- []byte, block bool, msg []byte
if !p.Handshaked() {
return errStateMismatch
}
var ret error
if block {
timer := time.NewTimer(p.server.TimePerBlock / 2)
select {
case queue <- msg:
case <-p.done:
return errGone
ret = errGone
case <-timer.C:
ret = errBusy
}
if !errors.Is(ret, errBusy) && !timer.Stop() {
<-timer.C
}
} else {
select {
@ -102,7 +109,7 @@ func (p *TCPPeer) putPacketIntoQueue(queue chan<- []byte, block bool, msg []byte
return errBusy
}
}
return nil
return ret
}
// EnqueuePacket implements the Peer interface.