Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(908)

Side by Side Diff: net/socket/ssl_client_socket_pool.cc

Issue 493793003: Align SSLClientSocketOpenSSL and SSLClientSocketNSS histograms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: asvitkine comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 base::TimeDelta::FromMinutes(1), 494 base::TimeDelta::FromMinutes(1),
495 100); 495 100);
496 496
497 SSLInfo ssl_info; 497 SSLInfo ssl_info;
498 ssl_socket_->GetSSLInfo(&ssl_info); 498 ssl_socket_->GetSSLInfo(&ssl_info);
499 499
500 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_CipherSuite", 500 UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_CipherSuite",
501 SSLConnectionStatusToCipherSuite( 501 SSLConnectionStatusToCipherSuite(
502 ssl_info.connection_status)); 502 ssl_info.connection_status));
503 503
504 UMA_HISTOGRAM_BOOLEAN(
505 "Net.RenegotiationExtensionSupported",
506 (ssl_info.connection_status &
507 SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) == 0);
508
504 if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_RESUME) { 509 if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_RESUME) {
505 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Resume_Handshake", 510 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Resume_Handshake",
506 connect_duration, 511 connect_duration,
507 base::TimeDelta::FromMilliseconds(1), 512 base::TimeDelta::FromMilliseconds(1),
508 base::TimeDelta::FromMinutes(1), 513 base::TimeDelta::FromMinutes(1),
509 100); 514 100);
510 } else if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_FULL) { 515 } else if (ssl_info.handshake_type == SSLInfo::HANDSHAKE_FULL) {
511 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Full_Handshake", 516 UMA_HISTOGRAM_CUSTOM_TIMES("Net.SSL_Connection_Latency_Full_Handshake",
512 connect_duration, 517 connect_duration,
513 base::TimeDelta::FromMilliseconds(1), 518 base::TimeDelta::FromMilliseconds(1),
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 if (base_.CloseOneIdleSocket()) 825 if (base_.CloseOneIdleSocket())
821 return true; 826 return true;
822 return base_.CloseOneIdleConnectionInHigherLayeredPool(); 827 return base_.CloseOneIdleConnectionInHigherLayeredPool();
823 } 828 }
824 829
825 void SSLClientSocketPool::OnSSLConfigChanged() { 830 void SSLClientSocketPool::OnSSLConfigChanged() {
826 FlushWithError(ERR_NETWORK_CHANGED); 831 FlushWithError(ERR_NETWORK_CHANGED);
827 } 832 }
828 833
829 } // namespace net 834 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698