Repository: trafficserver Updated Branches: refs/heads/master 8dfbde991 -> d50a3cba0
[TS-3727]: replace ink_get_hrtime_internal() with Thread::get_hrtime(). Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d50a3cba Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d50a3cba Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d50a3cba Branch: refs/heads/master Commit: d50a3cba09dba031d3328dc592318a33c2e166e7 Parents: 8dfbde9 Author: Sudheer Vinukonda <[email protected]> Authored: Tue Jun 30 15:34:54 2015 +0000 Committer: Sudheer Vinukonda <[email protected]> Committed: Tue Jun 30 15:34:54 2015 +0000 ---------------------------------------------------------------------- iocore/net/SSLNetVConnection.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d50a3cba/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index f9092db..9905efc 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -466,7 +466,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread) readSignalError(nh, err); } else if (ret == SSL_HANDSHAKE_WANT_READ || ret == SSL_HANDSHAKE_WANT_ACCEPT) { if (SSLConfigParams::ssl_handshake_timeout_in > 0) { - double handshake_time = ((ink_get_hrtime_internal() - sslHandshakeBeginTime)/1000000000); + double handshake_time = ((Thread::get_hrtime() - sslHandshakeBeginTime)/1000000000); Debug ("ssl", "ssl handshake for vc %p, took %.3f seconds, configured handshake_timer: %d", this, handshake_time, SSLConfigParams::ssl_handshake_timeout_in); if (handshake_time > SSLConfigParams::ssl_handshake_timeout_in) { Debug ("ssl", "ssl handshake for vc %p, expired, release the connection", this); @@ -851,7 +851,7 @@ int SSLNetVConnection::sslStartHandShake(int event, int &err) { if (sslHandshakeBeginTime == 0) { - sslHandshakeBeginTime = ink_get_hrtime_internal(); + sslHandshakeBeginTime = Thread::get_hrtime(); // net_activity will not be triggered until after the handshake set_inactivity_timeout(HRTIME_SECONDS(SSLConfigParams::ssl_handshake_timeout_in)); }
