Log sent and received bytes in net::BidirectionalStream

net/http/bidirectional_stream.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/bidirectional_stream.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 29 matching lines @@
 BidirectionalStream::BidirectionalStream(
     scoped_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
     Delegate* delegate,
     scoped_ptr<base::Timer> timer)
     : request_info_(std::move(request_info)),
       net_log_(BoundNetLog::Make(session->net_log(),
                                  NetLog::SOURCE_BIDIRECTIONAL_STREAM)),
       session_(session),
       delegate_(delegate),
-      timer_(std::move(timer)) {
+      timer_(std::move(timer)),
+      write_buffer_len_(0) {
   DCHECK(delegate_);
   DCHECK(request_info_);
 
   SSLConfig server_ssl_config;
   session->ssl_config_service()->GetSSLConfig(&server_ssl_config);
   session->GetAlpnProtos(&server_ssl_config.alpn_protos);
   session->GetNpnProtos(&server_ssl_config.npn_protos);
 
   if (!request_info_->url.SchemeIs(url::kHttpsScheme)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ skipping 18 matching lines @@
   DCHECK(!stream_impl_);
 }
 
 BidirectionalStream::~BidirectionalStream() {
   Cancel();
 }
 
 int BidirectionalStream::ReadData(IOBuffer* buf, int buf_len) {
   DCHECK(stream_impl_);
 
-  return stream_impl_->ReadData(buf, buf_len);
+  int rv = stream_impl_->ReadData(buf, buf_len);
+  if (rv > 0) {
+    net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, rv,
+                                  buf->data());
+  } else if (rv == ERR_IO_PENDING) {
+    read_buffer_ = buf;
+    // Bytes will be logged in OnDataRead().
+  }
+  return rv;
 }
 
 void BidirectionalStream::SendData(IOBuffer* data,
                                    int length,
                                    bool end_stream) {
   DCHECK(stream_impl_);
 
   stream_impl_->SendData(data, length, end_stream);
+  write_buffer_ = data;
+  write_buffer_len_ = length;
 }
 
 void BidirectionalStream::Cancel() {
   stream_request_.reset();
   if (stream_impl_) {
     stream_impl_->Cancel();
     stream_impl_.reset();
   }
 }
 
@@ skipping 31 matching lines @@
     return;
   }
 
   session_->http_stream_factory()->ProcessAlternativeServices(
       session_, response_info.headers.get(),
       HostPortPair::FromURL(request_info_->url));
   delegate_->OnHeadersReceived(response_headers);
 }
 
 void BidirectionalStream::OnDataRead(int bytes_read) {
+  DCHECK(read_buffer_);
+
+  net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, bytes_read,

[mmenke, 2016/04/13 18:03:50]

TYPE_SOCKET_BYTES_SENT is used for bytes sent at the socket layer.  Should
probably just add a new event for these.

[xunjieli, 2016/04/13 18:16:03]

Done.

+                                read_buffer_->data());
+  read_buffer_ = nullptr;
   delegate_->OnDataRead(bytes_read);
 }
 
 void BidirectionalStream::OnDataSent() {
+  DCHECK(write_buffer_);
+
+  net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_SENT,
+                                write_buffer_len_, write_buffer_->data());
+  write_buffer_ = nullptr;
+  write_buffer_len_ = 0;
   delegate_->OnDataSent();
 }
 
 void BidirectionalStream::OnTrailersReceived(const SpdyHeaderBlock& trailers) {
   delegate_->OnTrailersReceived(trailers);
 }
 
 void BidirectionalStream::OnFailed(int status) {
   delegate_->OnFailed(status);
 }
@@ skipping 65 matching lines @@
     const ProxyInfo& used_proxy_info,
     HttpStream* stream) {
   DCHECK(stream_request_);
 
   delegate_->OnFailed(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
 void BidirectionalStream::OnQuicBroken() {}
 
 }  // namespace net