Skip to content

Extended status - estatus #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orotemo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Extended status - estatus #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a4635b
add waiting to status, as it is an essential part of the status
orotemo Dec 5, 2018
38a46fa
adds estatus as extended status for poolboy including waiting procs l…
orotemo Dec 5, 2018
eb219f8
test that the waiting status is reported correctly
orotemo Dec 9, 2018
31ec825
revert tests for eqc
orotemo Dec 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/poolboy.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

-export([checkout/1, checkout/2, checkout/3, checkin/2, transaction/2,
transaction/3, child_spec/2, child_spec/3, start/1, start/2,
start_link/1, start_link/2, stop/1, status/1]).
start_link/1, start_link/2, stop/1, status/1, estatus/1]).
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
code_change/3]).
-export_type([pool/0]).
Expand Down Expand Up @@ -122,6 +122,10 @@ stop(Pool) ->
status(Pool) ->
gen_server:call(Pool, status).

-spec estatus(Pool :: pool()) -> {atom(), integer(), integer(), integer()}.
estatus(Pool) ->
gen_server:call(Pool, estatus).

init({PoolArgs, WorkerArgs}) ->
process_flag(trap_exit, true),
Waiting = queue:new(),
Expand Down Expand Up @@ -206,6 +210,18 @@ handle_call(status, _From, State) ->
overflow = Overflow} = State,
StateName = state_name(State),
{reply, {StateName, length(Workers), Overflow, ets:info(Monitors, size)}, State};
handle_call(estatus, _From, State) ->
#state{workers = Workers,
monitors = Monitors,
overflow = Overflow,
waiting = Waiting} = State,
StateName = state_name(State),
Status = {StateName,
length(Workers),
Overflow,
ets:info(Monitors, size),
queue:len(Waiting)},
{reply, Status, State};
handle_call(get_avail_workers, _From, State) ->
Workers = State#state.workers,
{reply, Workers, State};
Expand Down
34 changes: 34 additions & 0 deletions test/poolboy_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ pool_test_() ->
},
{<<"Pool returns status">>,
fun pool_returns_status/0
},{<<"Pool returns extended status">>,
fun pool_returns_estatus/0
},
{<<"Pool demonitors previously waiting processes">>,
fun demonitors_previously_waiting_processes/0
Expand Down Expand Up @@ -446,6 +448,38 @@ pool_returns_status() ->
?assertEqual({full, 0, 0, 0}, poolboy:status(Pool4)),
ok = pool_call(Pool4, stop).

pool_returns_estatus() ->
{ok, Pool} = new_pool(2, 0),
?assertEqual({ready, 2, 0, 0, 0}, poolboy:estatus(Pool)),
poolboy:checkout(Pool),
?assertEqual({ready, 1, 0, 1, 0}, poolboy:estatus(Pool)),
poolboy:checkout(Pool),
?assertEqual({full, 0, 0, 2, 0}, poolboy:estatus(Pool)),
spawn(fun() -> poolboy:checkout(Pool) end),
timer:sleep(50),
?assertEqual({full, 0, 0, 2, 1}, poolboy:estatus(Pool)),
ok = pool_call(Pool, stop),

{ok, Pool2} = new_pool(1, 1),
?assertEqual({ready, 1, 0, 0, 0}, poolboy:estatus(Pool2)),
poolboy:checkout(Pool2),
?assertEqual({overflow, 0, 0, 1, 0}, poolboy:estatus(Pool2)),
poolboy:checkout(Pool2),
?assertEqual({full, 0, 1, 2, 0}, poolboy:estatus(Pool2)),
ok = pool_call(Pool2, stop),

{ok, Pool3} = new_pool(0, 2),
?assertEqual({overflow, 0, 0, 0, 0}, poolboy:estatus(Pool3)),
poolboy:checkout(Pool3),
?assertEqual({overflow, 0, 1, 1, 0}, poolboy:estatus(Pool3)),
poolboy:checkout(Pool3),
?assertEqual({full, 0, 2, 2, 0}, poolboy:estatus(Pool3)),
ok = pool_call(Pool3, stop),

{ok, Pool4} = new_pool(0, 0),
?assertEqual({full, 0, 0, 0, 0}, poolboy:estatus(Pool4)),
ok = pool_call(Pool4, stop).

demonitors_previously_waiting_processes() ->
{ok, Pool} = new_pool(1,0),
Self = self(),
Expand Down