gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

qlog sending of packets before logging packet-related events

Browse Source 
When we send a packet, we might set a loss detection timer. The log will
be easier to interpret if the log loss_timer_updated event comes after
the packet_sent event.
This commit is contained in:
Marten Seemann
2020-03-30 10:57:11 +07:00
parent b9ab1d172d
commit 673b2ddad3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
session.go
View File

@@ -1363,6 +1363,7 @@ func (s *session) sendPacket() (bool, error) {
if err != nil || packet == nil { if err != nil || packet == nil {
return false, err return false, err
} }
s.logCoalescedPacket(now, packet)
for _, p := range packet.packets { for _, p := range packet.packets {
if s.firstAckElicitingPacketAfterIdleSentTime.IsZero() && p.IsAckEliciting() { if s.firstAckElicitingPacketAfterIdleSentTime.IsZero() && p.IsAckEliciting() {
s.firstAckElicitingPacketAfterIdleSentTime = now s.firstAckElicitingPacketAfterIdleSentTime = now
@@ -1370,7 +1371,6 @@ func (s *session) sendPacket() (bool, error) {
s.sentPacketHandler.SentPacket(p.ToAckHandlerPacket(now, s.retransmissionQueue)) s.sentPacketHandler.SentPacket(p.ToAckHandlerPacket(now, s.retransmissionQueue))
} }
s.connIDManager.SentPacket() s.connIDManager.SentPacket()
s.logCoalescedPacket(now, packet)
s.sendQueue.Send(packet.buffer) s.sendQueue.Send(packet.buffer)
return true, nil return true, nil
} }
@@ -1387,9 +1387,9 @@ func (s *session) sendPackedPacket(packet *packedPacket) {
if s.firstAckElicitingPacketAfterIdleSentTime.IsZero() && packet.IsAckEliciting() { if s.firstAckElicitingPacketAfterIdleSentTime.IsZero() && packet.IsAckEliciting() {
s.firstAckElicitingPacketAfterIdleSentTime = now s.firstAckElicitingPacketAfterIdleSentTime = now
} }
s.logPacket(now, packet)
s.sentPacketHandler.SentPacket(packet.ToAckHandlerPacket(time.Now(), s.retransmissionQueue)) s.sentPacketHandler.SentPacket(packet.ToAckHandlerPacket(time.Now(), s.retransmissionQueue))
s.connIDManager.SentPacket() s.connIDManager.SentPacket()
s.logPacket(now, packet)
s.sendQueue.Send(packet.buffer) s.sendQueue.Send(packet.buffer)
} }