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 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 28 matching lines...) Expand all Loading... | |
39 size_t packet_size, | 39 size_t packet_size, |
40 NetLog::LogLevel /* log_level */) { | 40 NetLog::LogLevel /* log_level */) { |
41 base::DictionaryValue* dict = new base::DictionaryValue(); | 41 base::DictionaryValue* dict = new base::DictionaryValue(); |
42 dict->SetString("self_address", self_address->ToString()); | 42 dict->SetString("self_address", self_address->ToString()); |
43 dict->SetString("peer_address", peer_address->ToString()); | 43 dict->SetString("peer_address", peer_address->ToString()); |
44 dict->SetInteger("size", packet_size); | 44 dict->SetInteger("size", packet_size); |
45 return dict; | 45 return dict; |
46 } | 46 } |
47 | 47 |
48 base::Value* NetLogQuicPacketSentCallback( | 48 base::Value* NetLogQuicPacketSentCallback( |
49 QuicPacketSequenceNumber sequence_number, | 49 const SerializedPacket& serialized_packet, |
50 QuicPacketSequenceNumber original_sequence_number, | 50 QuicPacketSequenceNumber original_sequence_number, |
51 EncryptionLevel level, | 51 EncryptionLevel level, |
52 TransmissionType transmission_type, | 52 TransmissionType transmission_type, |
53 size_t packet_size, | 53 size_t packet_size, |
54 WriteResult result, | 54 QuicTime sent_time, |
55 NetLog::LogLevel /* log_level */) { | 55 NetLog::LogLevel /* log_level */) { |
56 base::DictionaryValue* dict = new base::DictionaryValue(); | 56 base::DictionaryValue* dict = new base::DictionaryValue(); |
57 dict->SetInteger("encryption_level", level); | 57 dict->SetInteger("encryption_level", level); |
58 dict->SetInteger("transmission_type", transmission_type); | 58 dict->SetInteger("transmission_type", transmission_type); |
59 dict->SetString("packet_sequence_number", | 59 dict->SetString("packet_sequence_number", |
60 base::Uint64ToString(sequence_number)); | 60 base::Uint64ToString(serialized_packet.sequence_number)); |
ramant (doing other things)
2014/10/03 03:40:55
Hi Ryan and Ian,
Should we log more info from se
Ian Swett
2014/10/03 17:50:30
I would think we'd want to log the original sequen
ramant (doing other things)
2014/10/03 22:05:43
We do. It is logged in the next line (61-62). Is t
Ian Swett
2014/10/05 17:51:03
Nope, I just missed that. Thanks!
| |
61 dict->SetString("original_sequence_number", | 61 dict->SetString("original_sequence_number", |
62 base::Uint64ToString(original_sequence_number)); | 62 base::Uint64ToString(original_sequence_number)); |
63 dict->SetInteger("size", packet_size); | 63 dict->SetInteger("size", packet_size); |
64 if (result.status != WRITE_STATUS_OK) { | 64 dict->SetInteger("sent_time_us", sent_time.ToDebuggingValue()); |
65 dict->SetInteger("net_error", result.error_code); | |
66 } | |
67 return dict; | 65 return dict; |
68 } | 66 } |
69 | 67 |
70 base::Value* NetLogQuicPacketHeaderCallback(const QuicPacketHeader* header, | 68 base::Value* NetLogQuicPacketHeaderCallback(const QuicPacketHeader* header, |
71 NetLog::LogLevel /* log_level */) { | 69 NetLog::LogLevel /* log_level */) { |
72 base::DictionaryValue* dict = new base::DictionaryValue(); | 70 base::DictionaryValue* dict = new base::DictionaryValue(); |
73 dict->SetString("connection_id", | 71 dict->SetString("connection_id", |
74 base::Uint64ToString(header->public_header.connection_id)); | 72 base::Uint64ToString(header->public_header.connection_id)); |
75 dict->SetInteger("reset_flag", header->public_header.reset_flag); | 73 dict->SetInteger("reset_flag", header->public_header.reset_flag); |
76 dict->SetInteger("version_flag", header->public_header.version_flag); | 74 dict->SetInteger("version_flag", header->public_header.version_flag); |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
456 case PING_FRAME: | 454 case PING_FRAME: |
457 // PingFrame has no contents to log, so just record that it was sent. | 455 // PingFrame has no contents to log, so just record that it was sent. |
458 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_PING_FRAME_SENT); | 456 net_log_.AddEvent(NetLog::TYPE_QUIC_SESSION_PING_FRAME_SENT); |
459 break; | 457 break; |
460 default: | 458 default: |
461 DCHECK(false) << "Illegal frame type: " << frame.type; | 459 DCHECK(false) << "Illegal frame type: " << frame.type; |
462 } | 460 } |
463 } | 461 } |
464 | 462 |
465 void QuicConnectionLogger::OnPacketSent( | 463 void QuicConnectionLogger::OnPacketSent( |
466 QuicPacketSequenceNumber sequence_number, | 464 const SerializedPacket& serialized_packet, |
467 QuicPacketSequenceNumber original_sequence_number, | 465 QuicPacketSequenceNumber original_sequence_number, |
468 EncryptionLevel level, | 466 EncryptionLevel level, |
469 TransmissionType transmission_type, | 467 TransmissionType transmission_type, |
470 const QuicEncryptedPacket& packet, | 468 const QuicEncryptedPacket& packet, |
471 WriteResult result) { | 469 QuicTime sent_time) { |
472 net_log_.AddEvent( | 470 net_log_.AddEvent( |
473 NetLog::TYPE_QUIC_SESSION_PACKET_SENT, | 471 NetLog::TYPE_QUIC_SESSION_PACKET_SENT, |
474 base::Bind(&NetLogQuicPacketSentCallback, sequence_number, | 472 base::Bind(&NetLogQuicPacketSentCallback, serialized_packet, |
475 original_sequence_number, level, transmission_type, | 473 original_sequence_number, level, transmission_type, |
476 packet.length(), result)); | 474 packet.length(), sent_time)); |
477 } | 475 } |
478 | 476 |
479 void QuicConnectionLogger::OnPacketReceived(const IPEndPoint& self_address, | 477 void QuicConnectionLogger::OnPacketReceived(const IPEndPoint& self_address, |
480 const IPEndPoint& peer_address, | 478 const IPEndPoint& peer_address, |
481 const QuicEncryptedPacket& packet) { | 479 const QuicEncryptedPacket& packet) { |
482 if (local_address_from_self_.GetFamily() == ADDRESS_FAMILY_UNSPECIFIED) { | 480 if (local_address_from_self_.GetFamily() == ADDRESS_FAMILY_UNSPECIFIED) { |
483 local_address_from_self_ = self_address; | 481 local_address_from_self_ = self_address; |
484 UMA_HISTOGRAM_ENUMERATION("Net.QuicSession.ConnectionTypeFromSelf", | 482 UMA_HISTOGRAM_ENUMERATION("Net.QuicSession.ConnectionTypeFromSelf", |
485 GetRealAddressFamily(self_address.address()), | 483 GetRealAddressFamily(self_address.address()), |
486 ADDRESS_FAMILY_LAST); | 484 ADDRESS_FAMILY_LAST); |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
880 continue; | 878 continue; |
881 } | 879 } |
882 // Record some overlapping patterns, to get a better picture, since this is | 880 // Record some overlapping patterns, to get a better picture, since this is |
883 // not very expensive. | 881 // not very expensive. |
884 if (i % 3 == 0) | 882 if (i % 3 == 0) |
885 six_packet_histogram->Add(recent_6_mask); | 883 six_packet_histogram->Add(recent_6_mask); |
886 } | 884 } |
887 } | 885 } |
888 | 886 |
889 } // namespace net | 887 } // namespace net |
OLD | NEW |