Skip to content

Add new worker to back of fifo queue #93

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
fishcakez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new worker to back of fifo queue #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions src/poolboy.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ handle_info({'DOWN', MRef, _, _, _}, State) ->
end;
handle_info({'EXIT', Pid, _Reason}, State) ->
#state{supervisor = Sup,
monitors = Monitors} = State,
monitors = Monitors,
strategy = Strategy} = State,
case ets:lookup(Monitors, Pid) of
[{Pid, _, MRef}] ->
true = erlang:demonitor(MRef),
Expand All @@ -246,7 +247,7 @@ handle_info({'EXIT', Pid, _Reason}, State) ->
case lists:member(Pid, State#state.workers) of
true ->
W = lists:filter(fun (P) -> P =/= Pid end, State#state.workers),
{noreply, State#state{workers = [new_worker(Sup) | W]}};
{noreply, State#state{workers = new_worker(Sup, Strategy, W)}};
false ->
{noreply, State}
end
Expand Down Expand Up @@ -281,6 +282,11 @@ new_worker(Sup, FromPid) ->
Ref = erlang:monitor(process, FromPid),
{Pid, Ref}.

new_worker(Sup, lifo, Workers) ->
[new_worker(Sup) | Workers];
new_worker(Sup, fifo, Workers) ->
Workers ++ [new_worker(Sup)].

dismiss_worker(Sup, Pid) ->
true = unlink(Pid),
supervisor:terminate_child(Sup, Pid).
Expand Down Expand Up @@ -320,7 +326,8 @@ handle_checkin(Pid, State) ->
handle_worker_exit(Pid, State) ->
#state{supervisor = Sup,
monitors = Monitors,
overflow = Overflow} = State,
overflow = Overflow,
strategy = Strategy} = State,
case queue:out(State#state.waiting) of
{{value, {From, CRef, MRef}}, LeftWaiting} ->
NewWorker = new_worker(State#state.supervisor),
Expand All @@ -330,10 +337,8 @@ handle_worker_exit(Pid, State) ->
{empty, Empty} when Overflow > 0 ->
State#state{overflow = Overflow - 1, waiting = Empty};
{empty, Empty} ->
Workers =
[new_worker(Sup)
| lists:filter(fun (P) -> P =/= Pid end, State#state.workers)],
State#state{workers = Workers, waiting = Empty}
Workers = lists:filter(fun (P) -> P =/= Pid end, State#state.workers),
State#state{workers = new_worker(Sup, Strategy, Workers), waiting = Empty}
end.

state_name(State = #state{overflow = Overflow}) when Overflow < 1 ->
Expand Down