Improve memory estimate of SpdySessionPool in net/ MemoryDumpProvider.

net/spdy/spdy_session_pool.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_pool.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "net/base/address_list.h"
 #include "net/base/trace_constants.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
+#include "net/spdy/hpack/hpack_constants.h"
+#include "net/spdy/hpack/hpack_huffman_table.h"
+#include "net/spdy/hpack/hpack_static_table.h"
+#include "net/spdy/platform/api/spdy_estimate_memory_usage.h"
 #include "net/spdy/spdy_session.h"
 
 namespace net {
 
 namespace {
 
 enum SpdySessionGetTypes {
   CREATED_NEW                 = 0,
   FOUND_EXISTING              = 1,
   FOUND_EXISTING_FROM_IP_POOL = 2,
@@ skipping 338 matching lines @@
   if (sessions_.empty())
     return;
   size_t total_size = 0;
   size_t buffer_size = 0;
   size_t cert_count = 0;
   size_t serialized_cert_size = 0;
   size_t num_active_sessions = 0;
   for (const auto& session : sessions_) {
     StreamSocket::SocketMemoryStats stats;
     bool is_session_active = false;
-    session->DumpMemoryStats(&stats, &is_session_active);
-    total_size += stats.total_size;
+    total_size += session->DumpMemoryStats(&stats, &is_session_active);
     buffer_size += stats.buffer_size;
     cert_count += stats.cert_count;
     serialized_cert_size += stats.serialized_cert_size;
     if (is_session_active)
       num_active_sessions++;
   }
+  total_size += SpdyEstimateMemoryUsage(ObtainHpackHuffmanTable()) +
+                SpdyEstimateMemoryUsage(ObtainHpackStaticTable());
   base::trace_event::MemoryAllocatorDump* dump =
       pmd->CreateAllocatorDump(base::StringPrintf(
           "%s/spdy_session_pool", parent_dump_absolute_name.c_str()));
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   total_size);
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameObjectCount,
                   base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                   sessions_.size());
   dump->AddScalar("active_session_count",
@@ skipping 76 matching lines @@
 
     if (idle_only && (*it)->is_active())
       continue;
 
     (*it)->CloseSessionOnError(error, description);
     DCHECK(!IsSessionAvailable(*it));
   }
 }
 
 }  // namespace net