refactor: SessionManager should use GenServer (prevents hard-to-avoid timeouts)
This commit is contained in:
parent
93f9852771
commit
5c5d2e3355
|
@ -145,9 +145,11 @@ defmodule Floof.PacketSpool do
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def handle_info(:collect_garbage, state) do
|
def handle_info(:collect_garbage, state) do
|
||||||
to_keep = Floof.SessionManager.get_keep_only()
|
case GenServer.call(Floof.SessionManager, :get_keep_only) do
|
||||||
|
:error ->
|
||||||
|
nil
|
||||||
|
|
||||||
if to_keep != nil do
|
{:ok, to_keep} ->
|
||||||
{:ok, items} = File.ls(state)
|
{:ok, items} = File.ls(state)
|
||||||
|
|
||||||
present =
|
present =
|
||||||
|
@ -172,8 +174,11 @@ defmodule Floof.PacketSpool do
|
||||||
|
|
||||||
for hash <- to_remove do
|
for hash <- to_remove do
|
||||||
case File.rm(hash_to_path(hash, state)) do
|
case File.rm(hash_to_path(hash, state)) do
|
||||||
:ok -> nil
|
:ok ->
|
||||||
{:error, e} -> Logger.error("spool: unable to remove #{inspect(hash)}: #{inspect(e)}")
|
nil
|
||||||
|
|
||||||
|
{:error, e} ->
|
||||||
|
Logger.error("spool: unable to remove #{inspect(hash)}: #{inspect(e)}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
defmodule Floof.SessionManager do
|
defmodule Floof.SessionManager do
|
||||||
use Agent
|
use GenServer
|
||||||
require Logger
|
require Logger
|
||||||
require Record
|
require Record
|
||||||
|
|
||||||
|
@ -9,17 +9,22 @@ defmodule Floof.SessionManager do
|
||||||
defstruct dets_file: :sessions, subs: %{}
|
defstruct dets_file: :sessions, subs: %{}
|
||||||
|
|
||||||
def start_link({file, opts}) do
|
def start_link({file, opts}) do
|
||||||
Agent.start_link(
|
GenServer.start_link(__MODULE__, {file, opts}, name: __MODULE__)
|
||||||
fn ->
|
|
||||||
{:ok, file} = :dets.open_file(file, opts ++ [type: :bag])
|
|
||||||
%Floof.SessionManager{dets_file: file}
|
|
||||||
end,
|
|
||||||
name: __MODULE__
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def init({file, opts}) do
|
||||||
|
{:ok, file} = :dets.open_file(file, opts ++ [type: :bag])
|
||||||
|
{:ok, %Floof.SessionManager{dets_file: file}}
|
||||||
|
end
|
||||||
|
|
||||||
|
### client interface
|
||||||
|
|
||||||
def attach(key, pid) do
|
def attach(key, pid) do
|
||||||
modify_subscription(key, fn oldpid, dets_file ->
|
GenServer.cast(
|
||||||
|
__MODULE__,
|
||||||
|
{:modify_subscription, key,
|
||||||
|
fn oldpid, dets_file ->
|
||||||
if oldpid != pid do
|
if oldpid != pid do
|
||||||
Floof.Distributor.unregister(pid)
|
Floof.Distributor.unregister(pid)
|
||||||
|
|
||||||
|
@ -36,33 +41,53 @@ defmodule Floof.SessionManager do
|
||||||
end
|
end
|
||||||
|
|
||||||
pid
|
pid
|
||||||
end)
|
end}
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def detach(key, pid) do
|
def detach(key, pid) do
|
||||||
modify_subscription(key, fn oldpid, _ ->
|
GenServer.cast(
|
||||||
|
__MODULE__,
|
||||||
|
{:modify_subscription, key,
|
||||||
|
fn oldpid, _ ->
|
||||||
if oldpid == pid do
|
if oldpid == pid do
|
||||||
send(pid, {:SessionDetached, key})
|
send(pid, {:SessionDetached, key})
|
||||||
nil
|
nil
|
||||||
else
|
else
|
||||||
oldpid
|
oldpid
|
||||||
end
|
end
|
||||||
end)
|
end}
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
defp modify_subscription(key, handler) do
|
def set_for_all(subkey, value, origin) do
|
||||||
Agent.cast(__MODULE__, fn state ->
|
GenServer.cast(__MODULE__, {:set_for_all, subkey, value, origin})
|
||||||
|
end
|
||||||
|
|
||||||
|
def set_soft_multi(key, subkeys) do
|
||||||
|
GenServer.cast(__MODULE__, {:set_soft_multi, key, subkeys})
|
||||||
|
end
|
||||||
|
|
||||||
|
def peek(key) do
|
||||||
|
GenServer.call(__MODULE__, {:peek, key})
|
||||||
|
end
|
||||||
|
|
||||||
|
def drop(key, subkeys) do
|
||||||
|
GenServer.cast(__MODULE__, {:drop, key, subkeys})
|
||||||
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def handle_cast({:modify_subscription, key, handler}, state) do
|
||||||
{_, subs2} =
|
{_, subs2} =
|
||||||
Map.get_and_update(state.subs, key, fn oldpid ->
|
Map.get_and_update(state.subs, key, fn oldpid ->
|
||||||
{nil, handler.(oldpid, state.dets_file)}
|
{nil, handler.(oldpid, state.dets_file)}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
%Floof.SessionManager{state | subs: subs2}
|
{:noreply, %Floof.SessionManager{state | subs: subs2}}
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_for_all(subkey, value, origin) do
|
@impl true
|
||||||
Agent.cast(__MODULE__, fn state ->
|
def handle_cast({:set_for_all, subkey, value, origin}, state) do
|
||||||
filter_keys =
|
filter_keys =
|
||||||
MapSet.new(
|
MapSet.new(
|
||||||
for {key, sub} <- state.subs do
|
for {key, sub} <- state.subs do
|
||||||
|
@ -88,61 +113,56 @@ defmodule Floof.SessionManager do
|
||||||
:ok = :dets.insert(state.dets_file, added_dets_ents)
|
:ok = :dets.insert(state.dets_file, added_dets_ents)
|
||||||
end
|
end
|
||||||
|
|
||||||
state
|
{:noreply, state}
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_soft_multi(key, subkeys) do
|
@impl true
|
||||||
Agent.cast(__MODULE__, fn state ->
|
def handle_cast({:set_soft_multi, key, subkeys}, state) do
|
||||||
:ok = :dets.insert(state.dets_file, for(subkey <- subkeys, do: {key, subkey}))
|
:ok = :dets.insert(state.dets_file, for(subkey <- subkeys, do: {key, subkey}))
|
||||||
state
|
{:noreply, state}
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def peek(key) do
|
@impl true
|
||||||
Agent.get(
|
def handle_cast({:drop, key, subkeys}, state) do
|
||||||
__MODULE__,
|
|
||||||
&case :dets.lookup(&1.dets_file, key) do
|
|
||||||
{:error, _} -> []
|
|
||||||
items -> Enum.map(items, fn {_, x} -> x end)
|
|
||||||
end,
|
|
||||||
:infinity
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
def drop(key, subkeys) do
|
|
||||||
Agent.cast(__MODULE__, fn state ->
|
|
||||||
dets_file = state.dets_file
|
dets_file = state.dets_file
|
||||||
|
|
||||||
for x <- subkeys do
|
for x <- subkeys do
|
||||||
:ok = :dets.delete_object(dets_file, {key, x})
|
:ok = :dets.delete_object(dets_file, {key, x})
|
||||||
end
|
end
|
||||||
|
|
||||||
state
|
{:noreply, state}
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_keep_only do
|
@impl true
|
||||||
Agent.get(
|
def handle_call({:peek, key}, _, state) do
|
||||||
__MODULE__,
|
{:reply,
|
||||||
fn state ->
|
case :dets.lookup(state.dets_file, key) do
|
||||||
case :dets.match(state.dets_file, {'_', '$1'}) do
|
{:error, _} -> []
|
||||||
|
items -> Enum.map(items, fn {_, x} -> x end)
|
||||||
|
end, state}
|
||||||
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def handle_call(:get_keep_only, _, state) do
|
||||||
|
{:reply,
|
||||||
|
case :dets.match(state.dets_file, {'_', '$2'}) do
|
||||||
{:error, e} ->
|
{:error, e} ->
|
||||||
Logger.error("garbage collection error: #{inspect(e)}")
|
Logger.error("garbage collection error: #{inspect(e)}")
|
||||||
nil
|
:error
|
||||||
|
|
||||||
keys ->
|
keys ->
|
||||||
for [key] <- keys, do: key
|
{:ok, Enum.map(keys, fn [x] -> x end)}
|
||||||
end
|
end, state}
|
||||||
end,
|
|
||||||
:infinity
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
defp all_session_keys(state) do
|
defp all_session_keys(state) do
|
||||||
case :dets.select(state.dets_file, [{{'_', '_'}, [], ['$1']}]) do
|
case :dets.match(state.dets_file, {'_', '$1'}) do
|
||||||
{:error, x} -> {:error, x}
|
{:error, e} ->
|
||||||
items -> {:ok, Enum.map(items, fn {x} -> x end)}
|
Logger.error("unable to fetch list of session keys: #{inspect(e)}")
|
||||||
|
{:error, e}
|
||||||
|
|
||||||
|
keys ->
|
||||||
|
{:ok, Enum.map(keys, fn [x] -> x end)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue