Skip to content

Added the possiblility to pass ets tweak options #8

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

Added the possiblility to pass ets tweak options #8

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:

strategy:
matrix:
otp_version: [22,23,24,25]
otp_version: [26,27,28]
os: [ubuntu-latest]

container:
image: erlang:${{ matrix.otp_version }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Compile
run: make
- name: Test
Expand Down
49 changes: 30 additions & 19 deletions src/router.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%% @author Maas-Maarten Zeeman <[email protected]>
%% @copyright 2014-2015 Maas-Maarten Zeeman
%% @copyright 2014-2025 Maas-Maarten Zeeman
%%
%% @doc In-memory trie router for fast parallel path lookups with wildcards.
%% Copyright 2014-2015 Maas-Maarten Zeeman
%% Copyright 2014-2025 Maas-Maarten Zeeman
%%

%% The contents of this file are subject to the Mozilla Public License
Expand All @@ -22,7 +22,7 @@

-author("Maas-Maarten Zeeman <[email protected]>").

-export([new/0, new/1, delete/1]).
-export([new/0, new/1, new/2, delete/1]).
-export([info/1]).

-export([add/3, remove/2, remove_path/3]).
Expand All @@ -44,11 +44,10 @@
node_table :: ets:tid(), %% record(trie_node)
trie_table :: ets:tid() , %% record(trie)
wildcard_table :: ets:tid(), %% record(wildcard).
path_table :: ets:tid(), % record(path) Table with paths
destination_table :: ets:tid() % record(destination), table with destinations
path_table :: ets:tid(), %% record(path) Table with paths
destination_table :: ets:tid() %% record(destination), table with destinations
}).


-type router() :: atom() | #router{}.
-type route() :: #route{}.

Expand Down Expand Up @@ -106,6 +105,11 @@
destination :: destination()
}).

-define(DEFAULT_ETS_TWEAK_OPTIONS, [
{read_concurrency, true},
{write_concurrency, auto}
]).

%%
%% Api
%%
Expand All @@ -114,27 +118,34 @@

-spec new() -> router().
new() ->
NodeTable = ets:new(node_table, [protected, set, {read_concurrency, true}, {keypos, 2}]),
TrieTable = ets:new(trie_table, [protected, set, {read_concurrency, true}, {keypos, 2}]),

WildcardTable = ets:new(wildcard_table, [protected, bag, {read_concurrency, true}, {keypos, 2}]),
PathTable = ets:new(path_table, [protected, bag, {read_concurrency, true}, {keypos, 2}]),
DestinationTable = ets:new(destination_table, [protected, bag, {read_concurrency, true}, {keypos, 2}]),

#router{node_table=NodeTable,
trie_table=TrieTable,
wildcard_table=WildcardTable,
path_table=PathTable,
destination_table=DestinationTable}.
new_router(?DEFAULT_ETS_TWEAK_OPTIONS).

%% @doc Create a new named router.

-spec new(atom()) -> router().
new(Name) ->
Router = new(),
new(Name, ?DEFAULT_ETS_TWEAK_OPTIONS).

-spec new(atom(), list()) -> router().
new(Name, EtsTweakOptions) ->
Router = new_router(EtsTweakOptions),
ok = router_reg:register(Name, Router),
Router.

new_router(EtsTweakOptions) ->
NodeTable = ets:new(node_table, [protected, set, {keypos, 2} | EtsTweakOptions]),
TrieTable = ets:new(trie_table, [protected, set, {keypos, 2} | EtsTweakOptions]),

WildcardTable = ets:new(wildcard_table, [protected, bag, {keypos, 2} | EtsTweakOptions]),
PathTable = ets:new(path_table, [protected, bag, {keypos, 2} | EtsTweakOptions]),
DestinationTable = ets:new(destination_table, [protected, bag, {keypos, 2} | EtsTweakOptions]),

#router{node_table=NodeTable,
trie_table=TrieTable,
wildcard_table=WildcardTable,
path_table=PathTable,
destination_table=DestinationTable}.

%% @doc Get usage statistics

info(#router{}=Router) ->
Expand Down