diff options
| author | vadimt <vadimt@chromium.org> | 2014-12-17 16:23:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-18 00:24:07 +0000 |
| commit | a1d0d9765fe193dfcd2eaad0c801c24398a75a5f (patch) | |
| tree | 15071c095d1e5a628ceb24b7fc17c36b7feb7978 | |
| parent | 3074852e8ec228c3696906f4d793a54c441ac035 (diff) | |
| download | chromium_src-a1d0d9765fe193dfcd2eaad0c801c24398a75a5f.zip chromium_src-a1d0d9765fe193dfcd2eaad0c801c24398a75a5f.tar.gz chromium_src-a1d0d9765fe193dfcd2eaad0c801c24398a75a5f.tar.bz2 | |
Instrumenting missing callbacks of SSL_do_handshake to find jank.
BUG=424386
Review URL: https://codereview.chromium.org/806183004
Cr-Commit-Position: refs/heads/master@{#308892}
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index c78a974..d74a755 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -1869,6 +1869,11 @@ long SSLClientSocketOpenSSL::BIOCallback( int cmd, const char *argp, int argi, long argl, long retvalue) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "424386 SSLClientSocketOpenSSL::BIOCallback")); + SSLClientSocketOpenSSL* socket = reinterpret_cast<SSLClientSocketOpenSSL*>( BIO_get_callback_arg(bio)); CHECK(socket); @@ -1880,6 +1885,11 @@ long SSLClientSocketOpenSSL::BIOCallback( void SSLClientSocketOpenSSL::InfoCallback(const SSL* ssl, int type, int /*val*/) { + // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION( + "424386 SSLClientSocketOpenSSL::InfoCallback")); + if (type == SSL_CB_HANDSHAKE_DONE) { SSLClientSocketOpenSSL* ssl_socket = SSLContext::GetInstance()->GetClientSocketFromSSL(ssl); |