Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: net/quic/quic_connection_logger.cc

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_cache_unittest.cc ('k') | net/quic/quic_session_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_connection_logger.cc
diff --git a/net/quic/quic_connection_logger.cc b/net/quic/quic_connection_logger.cc
index 27afbeaa81dceaf82d2ab9deab4c9fa938df9b6f..205a57175963a24a4a519b4ab354987bc3317a6d 100644
--- a/net/quic/quic_connection_logger.cc
+++ b/net/quic/quic_connection_logger.cc
@@ -47,7 +47,6 @@ base::Value* NetLogQuicPacketCallback(const IPEndPoint* self_address,
base::Value* NetLogQuicPacketSentCallback(
const SerializedPacket& serialized_packet,
- QuicPacketSequenceNumber original_sequence_number,
EncryptionLevel level,
TransmissionType transmission_type,
size_t packet_size,
@@ -58,13 +57,23 @@ base::Value* NetLogQuicPacketSentCallback(
dict->SetInteger("transmission_type", transmission_type);
dict->SetString("packet_sequence_number",
base::Uint64ToString(serialized_packet.sequence_number));
- dict->SetString("original_sequence_number",
- base::Uint64ToString(original_sequence_number));
dict->SetInteger("size", packet_size);
dict->SetInteger("sent_time_us", sent_time.ToDebuggingValue());
return dict;
}
+base::Value* NetLogQuicPacketRetransmittedCallback(
+ QuicPacketSequenceNumber old_sequence_number,
+ QuicPacketSequenceNumber new_sequence_number,
+ NetLog::LogLevel /* log_level */) {
+ base::DictionaryValue* dict = new base::DictionaryValue();
+ dict->SetString("old_packet_sequence_number",
+ base::Uint64ToString(old_sequence_number));
+ dict->SetString("new_packet_sequence_number",
+ base::Uint64ToString(new_sequence_number));
+ return dict;
+}
+
base::Value* NetLogQuicPacketHeaderCallback(const QuicPacketHeader* header,
NetLog::LogLevel /* log_level */) {
base::DictionaryValue* dict = new base::DictionaryValue();
@@ -480,11 +489,18 @@ void QuicConnectionLogger::OnPacketSent(
TransmissionType transmission_type,
const QuicEncryptedPacket& packet,
QuicTime sent_time) {
- net_log_.AddEvent(
- NetLog::TYPE_QUIC_SESSION_PACKET_SENT,
- base::Bind(&NetLogQuicPacketSentCallback, serialized_packet,
- original_sequence_number, level, transmission_type,
- packet.length(), sent_time));
+ if (original_sequence_number == 0) {
+ net_log_.AddEvent(
+ NetLog::TYPE_QUIC_SESSION_PACKET_SENT,
+ base::Bind(&NetLogQuicPacketSentCallback, serialized_packet,
+ level, transmission_type, packet.length(), sent_time));
+ } else {
+ net_log_.AddEvent(
+ NetLog::TYPE_QUIC_SESSION_PACKET_RETRANSMITTED,
+ base::Bind(&NetLogQuicPacketRetransmittedCallback,
+ original_sequence_number,
+ serialized_packet.sequence_number));
+ }
}
void QuicConnectionLogger::OnPacketReceived(const IPEndPoint& self_address,
« no previous file with comments | « net/http/http_cache_unittest.cc ('k') | net/quic/quic_session_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698