diff options
| author | Raimo Niskanen <[email protected]> | 2019-04-01 11:35:32 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-04-01 11:35:32 +0200 |
| commit | b727bbf3632b4a31cfa2c7b284b5cecd0b542f35 (patch) | |
| tree | c45cd5f3dce09686e08dbc71980e01b6e8ce1bc6 /lib/ssl/src/inet_tls_dist.erl | |
| parent | 2db15b8dd2af46c51d07dd7635057ab5421afe6d (diff) | |
| parent | 407783d977e5e3c21edf6f276dd78b272ad05e61 (diff) | |
| download | otp-b727bbf3632b4a31cfa2c7b284b5cecd0b542f35.tar.gz otp-b727bbf3632b4a31cfa2c7b284b5cecd0b542f35.tar.bz2 otp-b727bbf3632b4a31cfa2c7b284b5cecd0b542f35.zip | |
Merge branch 'raimo/ssl/tls-dist-fun-day/OTP-14792'
* raimo/ssl/tls-dist-fun-day/OTP-14792:
Skip all benchmark groups
Benchmark report relative core load
Improve printouts
Polish sched util benchmark
Improve printouts
Dist handshake with nodelay
Implement inet_crypto_dist benchmark example
Diffstat (limited to 'lib/ssl/src/inet_tls_dist.erl')
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index e7fab7ebc5..8d9b92361b 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2018. All Rights Reserved. +%% Copyright Ericsson AB 2011-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -132,8 +132,8 @@ f_recv(SslSocket, Length, Timeout) -> f_setopts_pre_nodeup(_SslSocket) -> ok. -f_setopts_post_nodeup(_SslSocket) -> - ok. +f_setopts_post_nodeup(SslSocket) -> + ssl:setopts(SslSocket, [nodelay()]). f_getll(DistCtrl) -> {ok, DistCtrl}. @@ -199,7 +199,7 @@ listen(Name) -> gen_listen(Driver, Name) -> case inet_tcp_dist:gen_listen(Driver, Name) of {ok, {Socket, Address, Creation}} -> - inet:setopts(Socket, [{packet, 4}]), + inet:setopts(Socket, [{packet, 4}, {nodelay, true}]), {ok, {Socket, Address#net_address{protocol=tls}, Creation}}; Other -> Other @@ -532,7 +532,7 @@ do_setup_connect(Driver, Kernel, Node, Address, Ip, TcpPort, Version, Type, MyNo case ssl:connect( Address, TcpPort, [binary, {active, false}, {packet, 4}, - Driver:family(), nodelay()] ++ Opts, + Driver:family(), {nodelay, true}] ++ Opts, net_kernel:connecttime()) of {ok, #sslsocket{pid = [_, DistCtrl| _]} = SslSocket} -> _ = monitor_pid(DistCtrl), |