Improve memory estimate of SpdySessionPool in net/ MemoryDumpProvider.

net/spdy/spdy_session.cc

 // Copyright (c) 2012 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/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "base/trace_event/memory_usage_estimator.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "net/base/proxy_delegate.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/ct_policy_status.h"
 #include "net/http/http_log_util.h"
 #include "net/http/http_network_session.h"
@@ skipping 514 matching lines @@
 }
 
 base::WeakPtr<SpdyStream> SpdyStreamRequest::ReleaseStream() {
   DCHECK(!session_);
   base::WeakPtr<SpdyStream> stream = stream_;
   DCHECK(stream);
   Reset();
   return stream;
 }
 
+size_t SpdyStreamRequest::EstimateMemoryUsage() const {
+  return base::trace_event::EstimateItemMemoryUsage(url_);
+}
+
 void SpdyStreamRequest::OnRequestCompleteSuccess(
     const base::WeakPtr<SpdyStream>& stream) {
   DCHECK(session_);
   DCHECK(!stream_);
   DCHECK(!callback_.is_null());
   CompletionCallback callback = callback_;
   Reset();
   DCHECK(stream);
   stream_ = stream;
   callback.Run(OK);
@@ skipping 480 matching lines @@
 bool SpdySession::CloseOneIdleConnection() {
   CHECK(!in_io_loop_);
   DCHECK(pool_);
   if (active_streams_.empty()) {
     DoDrainSession(ERR_CONNECTION_CLOSED, "Closing idle connection.");
   }
   // Return false as the socket wasn't immediately closed.
   return false;
 }
 
-void SpdySession::DumpMemoryStats(StreamSocket::SocketMemoryStats* stats,
-                                  bool* is_session_active) const {
+size_t SpdySession::DumpMemoryStats(StreamSocket::SocketMemoryStats* stats,
+                                    bool* is_session_active) const {
   *is_session_active = is_active();
   connection_->DumpMemoryStats(stats);
+  size_t memory_estimate =
+      stats->total_size + kReadBufferSize +
+      base::trace_event::EstimateMemoryUsage(spdy_session_key_) +
+      base::trace_event::EstimateMemoryUsage(pooled_aliases_) +
+      base::trace_event::EstimateMemoryUsage(active_streams_) +
+      base::trace_event::EstimateMemoryUsage(created_streams_) +
+      base::trace_event::EstimateMemoryUsage(write_queue_) +
+      base::trace_event::EstimateMemoryUsage(initial_settings_);
+  if (in_flight_write_)
+    memory_estimate += base::trace_event::EstimateMemoryUsage(in_flight_write_);
+  if (buffered_spdy_framer_) {
+    memory_estimate +=
+        base::trace_event::EstimateMemoryUsage(buffered_spdy_framer_);
+  }
+  // TODO(xunjieli): crbug.com/669108. Track |pending_create_stream_queue_|,

[Bence, 2017/02/02 14:15:19]

Nit: https://crbug.com/669108.  For the convenience of developers who use tools
that make a URL clickable only if scheme is present.

[xunjieli, 2017/02/02 14:53:42]

Done.

+  // |stream_send_unstall_queue_| after std::deque is supported in
+  // memory_usage_estimator.h.
+  return memory_estimate;
 }
 
 void SpdySession::EnqueueStreamWrite(
     const base::WeakPtr<SpdyStream>& stream,
     SpdyFrameType frame_type,
     std::unique_ptr<SpdyBufferProducer> producer) {
   DCHECK(frame_type == HEADERS || frame_type == DATA);
   EnqueueWrite(stream->priority(), frame_type, std::move(producer), stream);
 }
 
@@ skipping 2043 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net