squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'gun-replace-cast-with-call' into 'develop'

Browse Source 
gun ConnectionPool: replace casts with calls

See merge request pleroma/pleroma!2803
This commit is contained in:
rinpatch 2020-07-28 19:13:54 +00:00
commit f462f1c101
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/gun/connection_pool.ex
View File

@ -19,7 +19,7 @@ defmodule Pleroma.Gun.ConnectionPool do
get_gun_pid_from_worker(worker_pid, true)
[{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
GenServer.cast(worker_pid, {:add_client, self(), false})
GenServer.call(worker_pid, :add_client)
{:ok, gun_pid}
[] ->
@ -70,7 +70,7 @@ defmodule Pleroma.Gun.ConnectionPool do
case query_result do
[worker_pid] ->
GenServer.cast(worker_pid, {:remove_client, self()})
GenServer.call(worker_pid, :remove_client)
[] ->
:ok

30
lib/pleroma/gun/connection_pool/worker.ex
View File

@ -36,7 +36,16 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
end
@impl true
def handle_cast({:add_client, client_pid, send_pid_back}, %{key: key} = state) do
def handle_cast({:add_client, client_pid, send}, state) do
case handle_call(:add_client, {client_pid, nil}, state) do
{:reply, conn_pid, state, :hibernate} ->
if send, do: send(client_pid, {:conn_pid, conn_pid})
{:noreply, state, :hibernate}
end
end
@impl true
def handle_call(:add_client, {client_pid, _}, %{key: key} = state) do
time = :erlang.monotonic_time(:millisecond)
{{conn_pid, _, _, _}, _} =
@ -44,8 +53,6 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
{conn_pid, [client_pid | used_by], crf(time - last_reference, crf), time}
end)
if send_pid_back, do: send(client_pid, {:conn_pid, conn_pid})
state =
if state.timer != nil do
Process.cancel_timer(state[:timer])
@ -57,11 +64,11 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
ref = Process.monitor(client_pid)
state = put_in(state.client_monitors[client_pid], ref)
{:noreply, state, :hibernate}
{:reply, conn_pid, state, :hibernate}
end
@impl true
def handle_cast({:remove_client, client_pid}, %{key: key} = state) do
def handle_call(:remove_client, {client_pid, _}, %{key: key} = state) do
{{_conn_pid, used_by, _crf, _last_reference}, _} =
Registry.update_value(@registry, key, fn {conn_pid, used_by, crf, last_reference} ->
{conn_pid, List.delete(used_by, client_pid), crf, last_reference}
@ -78,7 +85,7 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
nil
end
{:noreply, %{state | timer: timer}, :hibernate}
{:reply, :ok, %{state | timer: timer}, :hibernate}
end
@impl true
@ -102,22 +109,13 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
@impl true
def handle_info({:DOWN, _ref, :process, pid, reason}, state) do
# Sometimes the client is dead before we demonitor it in :remove_client, so the message
# arrives anyway
case state.client_monitors[pid] do
nil ->
{:noreply, state, :hibernate}
_ref ->
:telemetry.execute(
[:pleroma, :connection_pool, :client_death],
%{client_pid: pid, reason: reason},
%{key: state.key}
)
handle_cast({:remove_client, pid}, state)
end
handle_cast({:remove_client, pid, false}, state)
end
# LRFU policy: https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.1478