Revert part of commit a13ca93

async_read_some() with null_buffers on ssl_socket has resulted in high CPU usage due to read callbacks even when there is no data to read.. This needs further investigation. Hence this has been reverted. Change-Id: I6f7311fcad19f268c5c4147e91d76dc5618fd075 Partiail-Bug: 1608731
Juniper · Oct 19, 2016 · 47c3953 · 47c3953
1 parent b699de3
commit 47c3953
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/io/ssl_session.cc b/src/io/ssl_session.cc
@@ -98,7 +98,7 @@ void SslSession::AsyncReadSome() {
     }
 
     if (established()) {
-        ssl_socket_->async_read_some(null_buffers(),
+        socket()->async_read_some(null_buffers(),
             bind(&TcpSession::AsyncReadHandler, TcpSessionPtr(this)));
     }
 }

diff --git a/src/io/test/ssl_server_test.cc b/src/io/test/ssl_server_test.cc
@@ -389,7 +389,7 @@ TEST_F(SslEchoServerTest, msg_send_recv) {
     client = NULL;
 }
 
-TEST_F(SslEchoServerTest, large_msg_send_recv) {
+TEST_F(SslEchoServerTest, DISABLED_large_msg_send_recv) {
 
     SetUpImmedidate();
     SslClient *client = new SslClient(evm_.get(), false, true);