summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/resources/net_internals/quic_view.js2
-rw-r--r--chrome/test/data/webui/net_internals/log_view_painter.js6
-rw-r--r--net/base/net_log_event_type_list.h32
-rw-r--r--net/base/net_log_source_type_list.h1
-rw-r--r--net/quic/quic_client_session.cc19
-rw-r--r--net/quic/quic_client_session.h7
-rw-r--r--net/quic/quic_client_session_test.cc3
-rw-r--r--net/quic/quic_http_stream.cc34
-rw-r--r--net/quic/quic_http_stream.h2
-rw-r--r--net/quic/quic_http_stream_test.cc2
-rw-r--r--net/quic/quic_reliable_client_stream.cc4
-rw-r--r--net/quic/quic_reliable_client_stream.h6
-rw-r--r--net/quic/quic_reliable_client_stream_test.cc2
-rw-r--r--net/quic/quic_stream_factory.cc2
14 files changed, 109 insertions, 13 deletions
diff --git a/chrome/browser/resources/net_internals/quic_view.js b/chrome/browser/resources/net_internals/quic_view.js
index e501d3a..388c0ba 100644
--- a/chrome/browser/resources/net_internals/quic_view.js
+++ b/chrome/browser/resources/net_internals/quic_view.js
@@ -95,6 +95,7 @@ var QuicView = (function() {
tablePrinter.addHeaderCell('Peer address');
tablePrinter.addHeaderCell('GUID');
tablePrinter.addHeaderCell('Active streams');
+ tablePrinter.addHeaderCell('Total streams');
for (var i = 0; i < quicSessions.length; i++) {
var session = quicSessions[i];
@@ -108,6 +109,7 @@ var QuicView = (function() {
tablePrinter.addCell(session.peer_address);
tablePrinter.addCell(session.guid);
tablePrinter.addCell(session.open_streams);
+ tablePrinter.addCell(session.total_streams);
}
return tablePrinter;
}
diff --git a/chrome/test/data/webui/net_internals/log_view_painter.js b/chrome/test/data/webui/net_internals/log_view_painter.js
index 19db099..fc8e7b6 100644
--- a/chrome/test/data/webui/net_internals/log_view_painter.js
+++ b/chrome/test/data/webui/net_internals/log_view_painter.js
@@ -311,7 +311,7 @@ function painterTestURLRequest() {
'params': {
'source_dependency': {
'id': 149,
- 'type': 11
+ 'type': EventSourceType.HTTP_STREAM_JOB
}
},
'phase': EventPhase.PHASE_NONE,
@@ -1077,7 +1077,7 @@ function painterTestHexEncodedBytes() {
'params': {
'source_dependency': {
'id': 634,
- 'type': 4
+ 'type': EventSourceType.CONNECT_JOB
}
},
'phase': EventPhase.PHASE_BEGIN,
@@ -1139,7 +1139,7 @@ function painterTestHexEncodedBytes() {
'params': {
'source_dependency': {
'id': 628,
- 'type': 11
+ 'type': EventSourceType.HTTP_STREAM_JOB
}
},
'phase': EventPhase.PHASE_BEGIN,
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index 050bd24..7a9dca4 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -1209,6 +1209,38 @@ EVENT_TYPE(SPDY_PROXY_CLIENT_SESSION)
// }
// ------------------------------------------------------------------------
+// QuicSession
+// ------------------------------------------------------------------------
+
+// The start/end of a QuicSession.
+// {
+// "host": <The host-port string>,
+// }
+EVENT_TYPE(QUIC_SESSION)
+
+// Session is closing because of an error.
+// {
+// "net_error": <Net error code for the closure>
+// }
+EVENT_TYPE(QUIC_SESSION_CLOSE_ON_ERROR)
+
+// ------------------------------------------------------------------------
+// QuicHttpStream
+// ------------------------------------------------------------------------
+
+// The stream is sending the request headers.
+// {
+// "headers": <The list of header:value pairs>
+// }
+EVENT_TYPE(QUIC_HTTP_STREAM_SEND_REQUEST_HEADERS)
+
+// The stream has read the response headers.
+// {
+// "headers": <The list of header:value pairs>
+// }
+EVENT_TYPE(QUIC_HTTP_STREAM_READ_RESPONSE_HEADERS)
+
+// ------------------------------------------------------------------------
// HttpStreamParser
// ------------------------------------------------------------------------
diff --git a/net/base/net_log_source_type_list.h b/net/base/net_log_source_type_list.h
index 66a5298..9b1dd2b 100644
--- a/net/base/net_log_source_type_list.h
+++ b/net/base/net_log_source_type_list.h
@@ -14,6 +14,7 @@ SOURCE_TYPE(PROXY_SCRIPT_DECIDER)
SOURCE_TYPE(CONNECT_JOB)
SOURCE_TYPE(SOCKET)
SOURCE_TYPE(SPDY_SESSION)
+SOURCE_TYPE(QUIC_SESSION)
SOURCE_TYPE(HOST_RESOLVER_IMPL_REQUEST)
SOURCE_TYPE(HOST_RESOLVER_IMPL_JOB)
SOURCE_TYPE(DISK_CACHE_ENTRY)
diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc
index 90b44e5..b67e8d9 100644
--- a/net/quic/quic_client_session.cc
+++ b/net/quic/quic_client_session.cc
@@ -19,17 +19,25 @@ namespace net {
QuicClientSession::QuicClientSession(QuicConnection* connection,
QuicConnectionHelper* helper,
QuicStreamFactory* stream_factory,
- const string& server_hostname)
+ const string& server_hostname,
+ NetLog* net_log)
: QuicSession(connection, false),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
ALLOW_THIS_IN_INITIALIZER_LIST(crypto_stream_(this, server_hostname)),
helper_(helper),
stream_factory_(stream_factory),
read_buffer_(new IOBufferWithSize(kMaxPacketSize)),
- read_pending_(false) {
+ read_pending_(false),
+ num_total_streams_(0),
+ net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)) {
+ // TODO(rch): pass in full host port proxy pair
+ net_log_.BeginEvent(
+ NetLog::TYPE_QUIC_SESSION,
+ NetLog::StringCallback("host", &server_hostname));
}
QuicClientSession::~QuicClientSession() {
+ net_log_.EndEvent(NetLog::TYPE_QUIC_SESSION);
}
QuicReliableClientStream* QuicClientSession::CreateOutgoingReliableStream() {
@@ -43,8 +51,9 @@ QuicReliableClientStream* QuicClientSession::CreateOutgoingReliableStream() {
return NULL;
}
QuicReliableClientStream* stream =
- new QuicReliableClientStream(GetNextStreamId(), this);
+ new QuicReliableClientStream(GetNextStreamId(), this, net_log_);
ActivateStream(stream);
+ ++num_total_streams_;
return stream;
}
@@ -116,12 +125,16 @@ void QuicClientSession::CloseSessionOnError(int error) {
CloseStream(id);
}
stream_factory_->OnSessionClose(this);
+ net_log_.BeginEvent(
+ NetLog::TYPE_QUIC_SESSION,
+ NetLog::IntegerCallback("net_error", error));
}
Value* QuicClientSession::GetInfoAsValue(const HostPortPair& pair) const {
DictionaryValue* dict = new DictionaryValue();
dict->SetString("host_port_pair", pair.ToString());
dict->SetInteger("open_streams", GetNumOpenStreams());
+ dict->SetInteger("total_streams", num_total_streams_);
dict->SetString("peer_address", peer_address().ToString());
dict->SetString("guid", base::Uint64ToString(guid()));
return dict;
diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h
index 637514f..0247e4d 100644
--- a/net/quic/quic_client_session.h
+++ b/net/quic/quic_client_session.h
@@ -31,7 +31,8 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession {
QuicClientSession(QuicConnection* connection,
QuicConnectionHelper* helper,
QuicStreamFactory* stream_factory,
- const std::string& server_hostname);
+ const std::string& server_hostname,
+ NetLog* net_log);
virtual ~QuicClientSession();
@@ -53,6 +54,8 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession {
base::Value* GetInfoAsValue(const HostPortPair& pair) const;
+ const BoundNetLog& net_log() const { return net_log_; }
+
protected:
// QuicSession methods:
virtual ReliableQuicStream* CreateIncomingReliableStream(
@@ -69,6 +72,8 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession {
scoped_refptr<IOBufferWithSize> read_buffer_;
bool read_pending_;
CompletionCallback callback_;
+ size_t num_total_streams_;
+ BoundNetLog net_log_;
DISALLOW_COPY_AND_ASSIGN(QuicClientSession);
};
diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc
index 4d5b795..cac38b5 100644
--- a/net/quic/quic_client_session_test.cc
+++ b/net/quic/quic_client_session_test.cc
@@ -7,6 +7,7 @@
#include <vector>
#include "base/stl_util.h"
+#include "net/base/capturing_net_log.h"
#include "net/base/test_completion_callback.h"
#include "net/quic/crypto/crypto_protocol.h"
#include "net/quic/test_tools/quic_test_utils.h"
@@ -24,7 +25,7 @@ class QuicClientSessionTest : public ::testing::Test {
QuicClientSessionTest()
: guid_(1),
connection_(new PacketSavingConnection(guid_, IPEndPoint())),
- session_(connection_, NULL, NULL, kServerHostname) {
+ session_(connection_, NULL, NULL, kServerHostname, NULL) {
}
QuicGuid guid_;
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index 4439ef7..0eaf0a1 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -48,6 +48,7 @@ int QuicHttpStream::InitializeStream(const HttpRequestInfo* request_info,
const CompletionCallback& callback) {
CHECK(stream_);
+ stream_net_log_ = stream_net_log;
request_info_ = request_info;
return OK;
@@ -72,12 +73,32 @@ int QuicHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
SpdyFramer::WriteHeaderBlock(&builder, 3, &headers);
scoped_ptr<SpdyFrame> frame(builder.take());
request_ = std::string(frame->data(), len);
+ // Log the actual request with the URL Request's net log.
+ stream_net_log_.AddEvent(
+ NetLog::TYPE_HTTP_TRANSACTION_SPDY_SEND_REQUEST_HEADERS,
+ base::Bind(&SpdyHeaderBlockNetLogCallback, &headers));
+ // Also log to the QuicSession's net log.
+ stream_->net_log().AddEvent(
+ NetLog::TYPE_QUIC_HTTP_STREAM_SEND_REQUEST_HEADERS,
+ base::Bind(&SpdyHeaderBlockNetLogCallback, &headers));
} else {
std::string path = HttpUtil::PathForRequest(request_info_->url);
std::string first_line = base::StringPrintf("%s %s HTTP/1.1\r\n",
request_info_->method.c_str(),
path.c_str());
request_ = first_line + request_headers.ToString();
+ // Log the actual request with the URL Request's net log.
+ stream_net_log_.AddEvent(
+ NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS,
+ base::Bind(&HttpRequestHeaders::NetLogCallback,
+ base::Unretained(&request_headers),
+ &first_line));
+ // Also log to the QuicSession's net log.
+ stream_->net_log().AddEvent(
+ NetLog::TYPE_QUIC_HTTP_STREAM_SEND_REQUEST_HEADERS,
+ base::Bind(&HttpRequestHeaders::NetLogCallback,
+ base::Unretained(&request_headers),
+ &first_line));
}
// Store the request body.
@@ -458,6 +479,12 @@ int QuicHttpStream::ParseResponseHeaders() {
BufferResponseBody(read_buf_->data(), delta);
}
+ // The URLRequest logs these headers, so only log to the QuicSession's
+ // net log.
+ stream_->net_log().AddEvent(
+ NetLog::TYPE_QUIC_HTTP_STREAM_READ_RESPONSE_HEADERS,
+ base::Bind(&SpdyHeaderBlockNetLogCallback, &headers));
+
SpdyHeadersToHttpResponse(headers, 3, response_info_);
// Put the peer's IP address and port into the response.
IPEndPoint address = stream_->GetPeerAddress();
@@ -487,6 +514,13 @@ int QuicHttpStream::ParseResponseHeaders() {
response_info_->vary_data.Init(*request_info_, *response_info_->headers);
response_headers_received_ = true;
+ // The URLRequest logs these headers, so only log to the QuicSession's
+ // net log.
+ stream_->net_log().AddEvent(
+ NetLog::TYPE_QUIC_HTTP_STREAM_READ_RESPONSE_HEADERS,
+ base::Bind(&HttpResponseHeaders::NetLogCallback,
+ response_info_->headers));
+
// Save the remaining received data.
int delta = read_buf_->offset() - end_offset;
if (delta > 0) {
diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h
index a3dd962..8e0853c 100644
--- a/net/quic/quic_http_stream.h
+++ b/net/quic/quic_http_stream.h
@@ -138,6 +138,8 @@ class NET_EXPORT_PRIVATE QuicHttpStream :
// Wraps raw_request_body_buf_ to read the remaining data progressively.
scoped_refptr<DrainableIOBuffer> request_body_buf_;
+ BoundNetLog stream_net_log_;
+
base::WeakPtrFactory<QuicHttpStream> weak_factory_;
};
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 641a306..4a5f333 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -174,7 +174,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<bool> {
connection_->SetSendAlgorithm(send_algorithm_);
connection_->SetReceiveAlgorithm(receive_algorithm_);
session_.reset(new QuicClientSession(connection_, helper_, NULL,
- "www.google.com"));
+ "www.google.com", NULL));
CryptoHandshakeMessage message;
message.tag = kSHLO;
session_->GetCryptoStream()->OnHandshakeMessage(message);
diff --git a/net/quic/quic_reliable_client_stream.cc b/net/quic/quic_reliable_client_stream.cc
index d2960f8..676db77 100644
--- a/net/quic/quic_reliable_client_stream.cc
+++ b/net/quic/quic_reliable_client_stream.cc
@@ -10,8 +10,10 @@
namespace net {
QuicReliableClientStream::QuicReliableClientStream(QuicStreamId id,
- QuicSession* session)
+ QuicSession* session,
+ const BoundNetLog& net_log)
: ReliableQuicStream(id, session),
+ net_log_(net_log),
delegate_(NULL) {
}
diff --git a/net/quic/quic_reliable_client_stream.h b/net/quic/quic_reliable_client_stream.h
index fd5e6cc..77ac787 100644
--- a/net/quic/quic_reliable_client_stream.h
+++ b/net/quic/quic_reliable_client_stream.h
@@ -56,7 +56,8 @@ class NET_EXPORT_PRIVATE QuicReliableClientStream : public ReliableQuicStream {
};
QuicReliableClientStream(QuicStreamId id,
- QuicSession* session);
+ QuicSession* session,
+ const BoundNetLog& net_log);
virtual ~QuicReliableClientStream();
@@ -72,7 +73,10 @@ class NET_EXPORT_PRIVATE QuicReliableClientStream : public ReliableQuicStream {
Delegate* GetDelegate() { return delegate_; }
void OnError(int error);
+ const BoundNetLog& net_log() const { return net_log_; }
+
private:
+ BoundNetLog net_log_;
Delegate* delegate_;
DISALLOW_COPY_AND_ASSIGN(QuicReliableClientStream);
diff --git a/net/quic/quic_reliable_client_stream_test.cc b/net/quic/quic_reliable_client_stream_test.cc
index aa50408..7990f16 100644
--- a/net/quic/quic_reliable_client_stream_test.cc
+++ b/net/quic/quic_reliable_client_stream_test.cc
@@ -35,7 +35,7 @@ class QuicReliableClientStreamTest : public ::testing::Test {
public:
QuicReliableClientStreamTest()
: session_(new MockConnection(1, IPEndPoint()), false),
- stream_(1, &session_) {
+ stream_(1, &session_, BoundNetLog()) {
stream_.SetDelegate(&delegate_);
}
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index f9bb6e8..b388719 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -378,7 +378,7 @@ QuicClientSession* QuicStreamFactory::CreateSession(
QuicConnection* connection = new QuicConnection(guid, addr, helper);
QuicClientSession* session = new QuicClientSession(connection, helper, this,
- host);
+ host, net_log.net_log());
all_sessions_.insert(session); // owning pointer
return session;
}
generated by cgit v1.1 at 2025-03-03 11:55:10 +0000