Avoid creating MemoryAllocatorDump for individual sockets

net/socket/ssl_client_socket_impl.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/socket/ssl_client_socket_impl.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/feature_list.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_local.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 "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
 #include "net/base/trace_constants.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/ct_ev_whitelist.h"
@@ skipping 758 matching lines @@
 }
 
 void SSLClientSocketImpl::GetConnectionAttempts(ConnectionAttempts* out) const {
   out->clear();
 }
 
 int64_t SSLClientSocketImpl::GetTotalReceivedBytes() const {
   return transport_->socket()->GetTotalReceivedBytes();
 }
 
-void SSLClientSocketImpl::DumpMemoryStats(
-    base::trace_event::ProcessMemoryDump* pmd,
-    const std::string& parent_dump_absolute_name) const {
-  size_t total_size = 0;
-  base::trace_event::MemoryAllocatorDump* socket_dump =
-      pmd->CreateAllocatorDump(base::StringPrintf(
-          "%s/ssl_socket_%p", parent_dump_absolute_name.c_str(), this));
-  if (transport_adapter_) {
-    size_t bio_buffers_size = transport_adapter_->GetAllocationSize();
-    socket_dump->AddScalar("buffer_size",
-                           base::trace_event::MemoryAllocatorDump::kUnitsBytes,
-                           bio_buffers_size);
-    total_size += bio_buffers_size;
+void SSLClientSocketImpl::DumpMemoryStats(SocketMemoryStats* stats) const {
+  if (transport_adapter_)
+    stats->buffer_size = transport_adapter_->GetAllocationSize();
+  if (server_cert_chain_) {
+    for (size_t i = 0; i < server_cert_chain_->size(); ++i) {
+      X509* cert = server_cert_chain_->Get(i);
+      // This measures the lower bound of the serialized certificate. It doesn't
+      // measure the actual memory used, which is 4x this amount (see
+      // crbug.com/671420 for more details).
+      stats->serialized_cert_size += i2d_X509(cert, nullptr);
+    }
+    stats->cert_count = server_cert_chain_->size();

[eroman, 2017/01/11 02:19:58]

What is the expected contract for |stats| -- assignment or increment?

Here we assign, whereas above it just increments |serialized_cert_size| (without
first initializing it).

Either approach is fine so long as we are consistent throughout.

[xunjieli, 2017/01/11 20:05:07]

Done. Opted for the assignment way throughout.

   }
-  size_t total_cert_size = 0;
-  size_t certs_count = 0;
-  if (server_cert_chain_) {
-    certs_count = server_cert_chain_->size();
-    for (size_t i = 0; i < certs_count; ++i) {
-      X509* cert = server_cert_chain_->Get(i);
-      total_cert_size += i2d_X509(cert, nullptr);
-    }
-  }
-  total_size += total_cert_size;
-  // This measures the lower bound of the serialized certificate. It doesn't
-  // measure the actual memory used, which is 4x this amount (see
-  // crbug.com/671420 for more details).
-  socket_dump->AddScalar("serialized_cert_size",
-                         base::trace_event::MemoryAllocatorDump::kUnitsBytes,
-                         total_cert_size);
-  socket_dump->AddScalar("cert_count",
-                         base::trace_event::MemoryAllocatorDump::kUnitsObjects,
-                         certs_count);
-  socket_dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
-                         base::trace_event::MemoryAllocatorDump::kUnitsBytes,
-                         total_size);
+  stats->total_size = stats->buffer_size + stats->serialized_cert_size;
 }
 
 // static
 void SSLClientSocketImpl::DumpSSLClientSessionMemoryStats(
     base::trace_event::ProcessMemoryDump* pmd) {
   SSLContext::GetInstance()->session_cache()->DumpMemoryStats(pmd);
 }
 
 int SSLClientSocketImpl::Read(IOBuffer* buf,
                               int buf_len,
@@ skipping 1205 matching lines @@
     if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED &&
         !certificate_requested_) {
       net_error = ERR_SSL_PROTOCOL_ERROR;
     }
   }
 
   return net_error;
 }
 
 }  // namespace net