From 5d698250b228229001ca9966a390bf1545fcd0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 9 May 2011 22:01:31 +0200 Subject: Add a max_connections transport option. Limits the number of parallel requests processed at once. Waiting requests are kept in the accept queue. The limit is not explicitly observed, but it should be around the given value at any time. Defaults to 1024. Thanks to ostinelli's benchmark to point out the issue hopefully solved by this and the previous commit. --- src/cowboy_acceptor.erl | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'src/cowboy_acceptor.erl') diff --git a/src/cowboy_acceptor.erl b/src/cowboy_acceptor.erl index f27f446..9bcc733 100644 --- a/src/cowboy_acceptor.erl +++ b/src/cowboy_acceptor.erl @@ -13,28 +13,31 @@ %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -module(cowboy_acceptor). --export([start_link/5]). %% API. --export([acceptor/5]). %% Internal. +-export([start_link/6]). %% API. +-export([acceptor/6]). %% Internal. %% API. -spec start_link(LSocket::inet:socket(), Transport::module(), - Protocol::module(), Opts::term(), ReqsSup::pid()) -> {ok, Pid::pid()}. -start_link(LSocket, Transport, Protocol, Opts, ReqsSup) -> + Protocol::module(), Opts::term(), + MaxConns::non_neg_integer(), ReqsSup::pid()) -> {ok, Pid::pid()}. +start_link(LSocket, Transport, Protocol, Opts, MaxConns, ReqsSup) -> Pid = spawn_link(?MODULE, acceptor, - [LSocket, Transport, Protocol, Opts, ReqsSup]), + [LSocket, Transport, Protocol, Opts, MaxConns, ReqsSup]), {ok, Pid}. %% Internal. -spec acceptor(LSocket::inet:socket(), Transport::module(), - Protocol::module(), Opts::term(), ReqsSup::pid()) -> no_return(). -acceptor(LSocket, Transport, Protocol, Opts, ReqsSup) -> + Protocol::module(), Opts::term(), + MaxConns::non_neg_integer(), ReqsSup::pid()) -> no_return(). +acceptor(LSocket, Transport, Protocol, Opts, MaxConns, ReqsSup) -> case Transport:accept(LSocket, 2000) of {ok, CSocket} -> {ok, Pid} = supervisor:start_child(ReqsSup, [CSocket, Transport, Protocol, Opts]), - Transport:controlling_process(CSocket, Pid); + Transport:controlling_process(CSocket, Pid), + limit_reqs(MaxConns, ReqsSup); {error, timeout} -> ignore; {error, _Reason} -> @@ -42,4 +45,13 @@ acceptor(LSocket, Transport, Protocol, Opts, ReqsSup) -> %% we may want to try and listen again on the port? ignore end, - ?MODULE:acceptor(LSocket, Transport, Protocol, Opts, ReqsSup). + ?MODULE:acceptor(LSocket, Transport, Protocol, Opts, MaxConns, ReqsSup). + +-spec limit_reqs(MaxConns::non_neg_integer(), ReqsSup::pid()) -> ok. +limit_reqs(MaxConns, ReqsSup) -> + Counts = supervisor:count_children(ReqsSup), + Active = lists:keyfind(active, 1, Counts), + case Active < MaxConns of + true -> ok; + false -> timer:sleep(1) + end. -- cgit v1.2.3