From 87bb89bede51c2f3a020676598b1820941c4a076 Mon Sep 17 00:00:00 2001 From: Pedram Nimreezi Date: Thu, 7 Nov 2013 16:13:02 -0500 Subject: [PATCH] Remove unnecessary code, add consistency --- src/glc_code.erl | 2 +- src/gr_counter.erl | 14 +++++++------- src/gr_param.erl | 9 +-------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/glc_code.erl b/src/glc_code.erl index 1111bd9..c966e59 100644 --- a/src/glc_code.erl +++ b/src/glc_code.erl @@ -326,7 +326,7 @@ abstract_count(Counter) -> %% @todo Pass state record. Only Generate code if `statistics' is enabled. -spec abstract_getcount(atom()) -> [syntaxTree()]. abstract_getcount(Counter) -> - [abstract_apply(gr_counter, check, + [abstract_apply(gr_counter, lookup_element, [abstract_apply(table, [?erl:atom(counters)]), ?erl:abstract(Counter)])]. diff --git a/src/gr_counter.erl b/src/gr_counter.erl index 76f7dd5..d2276f1 100644 --- a/src/gr_counter.erl +++ b/src/gr_counter.erl @@ -18,7 +18,7 @@ %% API -export([start_link/1, - check/1, check/2, + list/1, lookup_element/2, update/3]). %% gen_server callbacks @@ -34,11 +34,11 @@ %%%=================================================================== %%% API %%%=================================================================== -check(Server) -> - gen_server:call(Server, check). +list(Server) -> + gen_server:call(Server, list). -check(Server, Counter) -> - gen_server:call(Server, {check, Counter}). +lookup_element(Server, Counter) -> + gen_server:call(Server, {lookup_element, Counter}). update(Server, Counter, Value) -> gen_server:cast(Server, {update, Counter, Value}). @@ -85,10 +85,10 @@ init([]) -> %% {stop, Reason, State} %% @end %%-------------------------------------------------------------------- -handle_call(check, _From, State) -> +handle_call(list, _From, State) -> TableId = State#state.table_id, {reply, {ok, ets:tab2list(TableId)}, State}; -handle_call({check, Counter}, _From, State) -> +handle_call({lookup_element, Counter}, _From, State) -> TableId = State#state.table_id, {reply, ets:lookup_element(TableId, Counter, 2), State}; handle_call(_Request, _From, State) -> diff --git a/src/gr_param.erl b/src/gr_param.erl index 700d6c3..e7ac2a2 100644 --- a/src/gr_param.erl +++ b/src/gr_param.erl @@ -20,7 +20,7 @@ -export([start_link/1, list/1, size/1, insert/2, lookup/2, lookup_element/2, - info/1, update/2, transform/1]). + info/1, transform/1]). %% gen_server callbacks -export([init/1, @@ -53,9 +53,6 @@ lookup_element(Server, Term) -> info(Server) -> gen_server:call(Server, info). -update(Counter, Value) -> - gen_server:cast(?MODULE, {update, Counter, Value}). - %% @doc Transform Term -> Key to Key -> Term transform(Server) -> gen_server:call(Server, transform). @@ -140,10 +137,6 @@ handle_call(_Request, _From, State) -> %% {stop, Reason, State} %% @end %%-------------------------------------------------------------------- -handle_cast({update, Counter, Value}, State) -> - TableId = State#state.table_id, - ets:update_counter(TableId, Counter, Value), - {noreply, State}; handle_cast(_Msg, State) -> {noreply, State}.