summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-11 13:54:04 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-01-20 10:40:44 +0000
commitc9e6b5854197dd33d4e20ed78aee8382472a0f01 (patch)
tree644a9acc2b74a9f2812f686304455f023886661a /io
parent473c20d86ea0cdd1307bfd5c89f89c3ba2c316a1 (diff)
enable tcpNoDelay for loopback connections automatically
it can make a significant speed difference for applications talking to the office binary via UNO Change-Id: If6e901908fe6a6119ac1fd0bf8feebabe5602ff7 Reviewed-on: https://gerrit.libreoffice.org/13856 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'io')
-rw-r--r--io/source/acceptor/acc_socket.cxx6
-rw-r--r--io/source/connector/connector.cxx4
2 files changed, 8 insertions, 2 deletions
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 830a9b36375d..89fb44dde0f4 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -380,7 +380,11 @@ namespace io_acceptor {
}
pConn->completeConnectionString();
- if( m_bTcpNoDelay )
+ OUString remoteHostname = pConn->m_addr.getHostname();
+ // we enable tcpNoDelay for loopback connections because
+ // it can make a significant speed difference on linux boxes.
+ if( m_bTcpNoDelay || remoteHostname == "localhost" ||
+ remoteHostname.startsWith("127.0.0.") )
{
sal_Int32 nTcpNoDelay = sal_True;
pConn->m_socket.setOption( osl_Socket_OptionTcpNoDelay , &nTcpNoDelay,
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 0aca22cc1685..81bfdb64ddb2 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -132,7 +132,9 @@ namespace stoc_connector
delete pConn;
throw NoConnectException( sMessage );
}
- if( bTcpNoDelay )
+ // we enable tcpNoDelay for loopback connections because
+ // it can make a significant speed difference on linux boxes.
+ if( bTcpNoDelay || aHost == "localhost" || aHost.startsWith("127.0.0.") )
{
sal_Int32 nTcpNoDelay = sal_True;
pConn->m_socket.setOption( osl_Socket_OptionTcpNoDelay , &nTcpNoDelay,