summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-04-23 14:03:14 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-04-23 14:03:14 +0100
commit07952cd078fa4d44ec14ae89956fec437e78cbcd (patch)
tree0862ea746e514d3b00b79f99e06d66d85b4ace8c
parent28ad2b62562ec293efeb52008a7fe838aa53dddd (diff)
downloadrabbitmq-server-07952cd078fa4d44ec14ae89956fec437e78cbcd.tar.gz
Increase buffer size for the port driver to match that used by the underlying socket.bug24866
-rw-r--r--src/rabbit_net.erl20
-rw-r--r--src/rabbit_reader.erl8
2 files changed, 23 insertions, 5 deletions
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index e6a05335..1a12d43b 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -18,8 +18,8 @@
-include("rabbit.hrl").
-export([is_ssl/1, ssl_info/1, controlling_process/2, getstat/2,
- recv/1, async_recv/3, port_command/2, setopts/2, send/2, close/1,
- maybe_fast_close/1, sockname/1, peername/1, peercert/1,
+ recv/1, async_recv/3, port_command/2, getopts/2, setopts/2, send/2,
+ close/1, maybe_fast_close/1, sockname/1, peername/1, peercert/1,
connection_string/2]).
%%---------------------------------------------------------------------------
@@ -34,6 +34,8 @@
-type(ok_val_or_error(A) :: rabbit_types:ok_or_error2(A, any())).
-type(ok_or_any_error() :: rabbit_types:ok_or_error(any())).
-type(socket() :: port() | #ssl_socket{}).
+-type(opts() :: [{atom(), any()} |
+ {raw, non_neg_integer(), non_neg_integer(), binary()}]).
-spec(is_ssl/1 :: (socket()) -> boolean()).
-spec(ssl_info/1 :: (socket())
@@ -49,9 +51,12 @@
-spec(async_recv/3 ::
(socket(), integer(), timeout()) -> rabbit_types:ok(any())).
-spec(port_command/2 :: (socket(), iolist()) -> 'true').
--spec(setopts/2 :: (socket(), [{atom(), any()} |
- {raw, non_neg_integer(), non_neg_integer(),
- binary()}]) -> ok_or_any_error()).
+-spec(getopts/2 :: (socket(), [atom() | {raw,
+ non_neg_integer(),
+ non_neg_integer(),
+ non_neg_integer() | binary()}])
+ -> ok_val_or_error(opts())).
+-spec(setopts/2 :: (socket(), opts()) -> ok_or_any_error()).
-spec(send/2 :: (socket(), binary() | iolist()) -> ok_or_any_error()).
-spec(close/1 :: (socket()) -> ok_or_any_error()).
-spec(maybe_fast_close/1 :: (socket()) -> ok_or_any_error()).
@@ -126,6 +131,11 @@ port_command(Sock, Data) when ?IS_SSL(Sock) ->
port_command(Sock, Data) when is_port(Sock) ->
erlang:port_command(Sock, Data).
+getopts(Sock, Options) when ?IS_SSL(Sock) ->
+ ssl:getopts(Sock#ssl_socket.ssl, Options);
+getopts(Sock, Options) when is_port(Sock) ->
+ inet:getopts(Sock, Options).
+
setopts(Sock, Options) when ?IS_SSL(Sock) ->
ssl:setopts(Sock#ssl_socket.ssl, Options);
setopts(Sock, Options) when is_port(Sock) ->
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 5e9e78d3..5acf6aca 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -222,6 +222,14 @@ start_connection(Parent, ChannelSupSupPid, Collector, StartHeartbeatFun, Deb,
last_blocked_by = none,
last_blocked_at = never},
try
+ BufSizes = inet_op(fun () ->
+ rabbit_net:getopts(
+ ClientSock, [sndbuf, recbuf, buffer])
+ end),
+ BufSz = lists:max([Sz || {_Opt, Sz} <- BufSizes]),
+ ok = inet_op(fun () ->
+ rabbit_net:setopts(ClientSock, [{buffer, BufSz}])
+ end),
recvloop(Deb, switch_callback(rabbit_event:init_stats_timer(
State, #v1.stats_timer),
handshake, 8)),