OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/quic/quic_connection_logger.h" | 5 #include "net/quic/quic_connection_logger.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
496 } | 496 } |
497 | 497 |
498 void QuicConnectionLogger::OnProtocolVersionMismatch( | 498 void QuicConnectionLogger::OnProtocolVersionMismatch( |
499 QuicVersion received_version) { | 499 QuicVersion received_version) { |
500 // TODO(rtenneti): Add logging. | 500 // TODO(rtenneti): Add logging. |
501 } | 501 } |
502 | 502 |
503 void QuicConnectionLogger::OnPacketHeader(const QuicPacketHeader& header) { | 503 void QuicConnectionLogger::OnPacketHeader(const QuicPacketHeader& header) { |
504 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_PACKET_AUTHENTICATED); | 504 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_PACKET_AUTHENTICATED); |
505 ++num_packets_received_; | 505 ++num_packets_received_; |
506 | |
507 const QuicPacketCount previous_largest_received_packet_number = | |
508 largest_received_packet_number_; | |
506 if (largest_received_packet_number_ < header.packet_number) { | 509 if (largest_received_packet_number_ < header.packet_number) { |
507 QuicPacketNumber delta = | 510 QuicPacketNumber delta = |
508 header.packet_number - largest_received_packet_number_; | 511 header.packet_number - largest_received_packet_number_; |
509 if (delta > 1) { | 512 if (delta > 1) { |
510 // There is a gap between the largest packet previously received and | 513 // There is a gap between the largest packet previously received and |
511 // the current packet. This indicates either loss, or out-of-order | 514 // the current packet. This indicates either loss, or out-of-order |
512 // delivery. | 515 // delivery. |
513 UMA_HISTOGRAM_COUNTS("Net.QuicSession.PacketGapReceived", | 516 UMA_HISTOGRAM_COUNTS("Net.QuicSession.PacketGapReceived", |
514 static_cast<base::HistogramBase::Sample>(delta - 1)); | 517 static_cast<base::HistogramBase::Sample>(delta - 1)); |
515 } | 518 } |
516 largest_received_packet_number_ = header.packet_number; | 519 largest_received_packet_number_ = header.packet_number; |
517 } | 520 } |
518 if (header.packet_number < received_packets_.size()) { | 521 if (header.packet_number < received_packets_.size()) { |
519 received_packets_[static_cast<size_t>(header.packet_number)] = true; | 522 received_packets_[static_cast<size_t>(header.packet_number)] = true; |
520 } | 523 } |
521 if (header.packet_number < last_received_packet_number_) { | 524 if (header.packet_number < last_received_packet_number_) { |
522 ++num_out_of_order_received_packets_; | 525 ++num_out_of_order_received_packets_; |
523 if (previous_received_packet_size_ < last_received_packet_size_) | 526 if (previous_received_packet_size_ < last_received_packet_size_) |
524 ++num_out_of_order_large_received_packets_; | 527 ++num_out_of_order_large_received_packets_; |
525 UMA_HISTOGRAM_COUNTS( | 528 UMA_HISTOGRAM_COUNTS( |
526 "Net.QuicSession.OutOfOrderGapReceived", | 529 "Net.QuicSession.OutOfOrderGapReceived", |
527 static_cast<base::HistogramBase::Sample>(last_received_packet_number_ - | 530 static_cast<base::HistogramBase::Sample>(last_received_packet_number_ - |
528 header.packet_number)); | 531 header.packet_number)); |
529 } | 532 } |
530 last_received_packet_number_ = header.packet_number; | 533 last_received_packet_number_ = header.packet_number; |
534 ReportPacketCounts(previous_largest_received_packet_number); | |
535 } | |
536 | |
537 void QuicConnectionLogger::ReportPacketCounts( | |
538 QuicPacketCount previous_largest_received_packet_number) const { | |
539 DCHECK_GE(largest_received_packet_number_, | |
540 previous_largest_received_packet_number); | |
541 if (!socket_performance_watcher_) | |
542 return; | |
543 | |
544 size_t packets_lost = 0; | |
545 size_t packets_received_in_order = 0; | |
546 size_t packets_received_out_of_order = 0; | |
547 | |
548 const size_t diff = | |
549 largest_received_packet_number_ - previous_largest_received_packet_number; | |
550 | |
551 if (diff == 0) { | |
552 // The received packet number has a lower sequence number than the expected | |
553 // sequence number. | |
554 packets_received_out_of_order = 1; | |
555 } else if (diff == 1) { | |
556 // The received packet number has the same sequence number as the expected | |
557 // sequence number. | |
558 packets_received_in_order = 1; | |
559 } else { | |
560 // The received packet number has higher sequence number as the expected | |
561 // sequence number. Report all packets with intermediate sequence numbers | |
562 // as lost. | |
563 packets_lost = diff - 1; | |
Ryan Hamilton
2016/03/01 18:20:32
This is a very aggressive definition of loss. Reor
tbansal1
2016/03/01 19:05:36
This API also reports p_r_out_of_order count. So,
Ryan Hamilton
2016/03/02 04:26:49
If you have a variable called "packets_lost" but i
tbansal1
2016/03/03 02:39:05
I will change the name, and send out the CL. In th
Ryan Hamilton
2016/03/03 04:24:24
The receiver will see packets 1, 2, ... 100, 500,
tbansal1
2016/03/03 23:34:46
Done.
| |
564 packets_received_in_order = 1; | |
565 } | |
566 socket_performance_watcher_->OnUpdatedPacketCountAvailable( | |
567 packets_lost, packets_received_in_order, packets_received_out_of_order); | |
531 } | 568 } |
532 | 569 |
533 void QuicConnectionLogger::OnStreamFrame(const QuicStreamFrame& frame) { | 570 void QuicConnectionLogger::OnStreamFrame(const QuicStreamFrame& frame) { |
534 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_STREAM_FRAME_RECEIVED, | 571 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_STREAM_FRAME_RECEIVED, |
535 base::Bind(&NetLogQuicStreamFrameCallback, &frame)); | 572 base::Bind(&NetLogQuicStreamFrameCallback, &frame)); |
536 } | 573 } |
537 | 574 |
538 void QuicConnectionLogger::OnAckFrame(const QuicAckFrame& frame) { | 575 void QuicConnectionLogger::OnAckFrame(const QuicAckFrame& frame) { |
539 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_ACK_FRAME_RECEIVED, | 576 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_ACK_FRAME_RECEIVED, |
540 base::Bind(&NetLogQuicAckFrameCallback, &frame)); | 577 base::Bind(&NetLogQuicAckFrameCallback, &frame)); |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
768 bit_mask_of_packets >>= 1; | 805 bit_mask_of_packets >>= 1; |
769 DCHECK_LT(range_start + bits_so_far, kBoundingSampleInCumulativeHistogram); | 806 DCHECK_LT(range_start + bits_so_far, kBoundingSampleInCumulativeHistogram); |
770 histogram->Add(range_start + bits_so_far); | 807 histogram->Add(range_start + bits_so_far); |
771 range_start += i + 1; | 808 range_start += i + 1; |
772 } | 809 } |
773 } | 810 } |
774 | 811 |
775 float QuicConnectionLogger::ReceivedPacketLossRate() const { | 812 float QuicConnectionLogger::ReceivedPacketLossRate() const { |
776 if (largest_received_packet_number_ <= num_packets_received_) | 813 if (largest_received_packet_number_ <= num_packets_received_) |
777 return 0.0f; | 814 return 0.0f; |
778 float num_received = largest_received_packet_number_ - num_packets_received_; | 815 float num_lost = largest_received_packet_number_ - num_packets_received_; |
779 return num_received / largest_received_packet_number_; | 816 return num_lost / largest_received_packet_number_; |
780 } | 817 } |
781 | 818 |
782 void QuicConnectionLogger::OnRttChanged(QuicTime::Delta rtt) const { | 819 void QuicConnectionLogger::OnRttChanged(QuicTime::Delta rtt) const { |
783 // Notify socket performance watcher of the updated RTT value. | 820 // Notify socket performance watcher of the updated RTT value. |
784 if (!socket_performance_watcher_) | 821 if (!socket_performance_watcher_) |
785 return; | 822 return; |
786 | 823 |
787 int64_t microseconds = rtt.ToMicroseconds(); | 824 int64_t microseconds = rtt.ToMicroseconds(); |
788 if (microseconds != 0) { | 825 if (microseconds != 0) { |
789 socket_performance_watcher_->OnUpdatedRTTAvailable( | 826 socket_performance_watcher_->OnUpdatedRTTAvailable( |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
874 continue; | 911 continue; |
875 } | 912 } |
876 // Record some overlapping patterns, to get a better picture, since this is | 913 // Record some overlapping patterns, to get a better picture, since this is |
877 // not very expensive. | 914 // not very expensive. |
878 if (i % 3 == 0) | 915 if (i % 3 == 0) |
879 six_packet_histogram->Add(recent_6_mask); | 916 six_packet_histogram->Add(recent_6_mask); |
880 } | 917 } |
881 } | 918 } |
882 | 919 |
883 } // namespace net | 920 } // namespace net |
OLD | NEW |