diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-11-20 16:40:15 +0100 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-11-20 16:40:15 +0100 |
| commit | bd31f797a1777fcbef2a16bb08ef52724422ec2c (patch) | |
| tree | a6c2a0d86c6dff7dd9fd65837ae3cec1b8dd4de5 | |
| parent | f61c0fca34adcc01d0dfc5e2944f74b0a555e01e (diff) | |
| download | rabbitmq-server-git-bd31f797a1777fcbef2a16bb08ef52724422ec2c.tar.gz | |
fixes various dialyzer warnings
| -rw-r--r-- | src/credit_flow.erl | 3 | ||||
| -rw-r--r-- | src/delegate.erl | 8 | ||||
| -rw-r--r-- | src/dtree.erl | 2 | ||||
| -rw-r--r-- | src/gatherer.erl | 4 | ||||
| -rw-r--r-- | src/gm.erl | 6 | ||||
| -rw-r--r-- | src/mirrored_supervisor.erl | 8 | ||||
| -rw-r--r-- | src/mnesia_sync.erl | 2 | ||||
| -rw-r--r-- | src/pg2_fixed.erl | 51 | ||||
| -rw-r--r-- | src/pg_local.erl | 32 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 2 |
10 files changed, 59 insertions, 59 deletions
diff --git a/src/credit_flow.erl b/src/credit_flow.erl index b9547cff1c..8b630929cd 100644 --- a/src/credit_flow.erl +++ b/src/credit_flow.erl @@ -189,7 +189,8 @@ unblock(From) -> case blocked() of false -> case erase(credit_deferred) of undefined -> ok; - Credits -> [To ! Msg || {To, Msg} <- Credits] + Credits -> _ = [To ! Msg || {To, Msg} <- Credits], + ok end; true -> ok end. diff --git a/src/delegate.erl b/src/delegate.erl index 4bf570cc27..394ebd42d9 100644 --- a/src/delegate.erl +++ b/src/delegate.erl @@ -131,7 +131,7 @@ invoke(Pids, FunOrMFA) when is_list(Pids) -> end, {[], BadPids}, ResultsNoNode). invoke_no_result(Pid, FunOrMFA) when is_pid(Pid) andalso node(Pid) =:= node() -> - safe_invoke(Pid, FunOrMFA), %% we don't care about any error + _ = safe_invoke(Pid, FunOrMFA), %% we don't care about any error ok; invoke_no_result(Pid, FunOrMFA) when is_pid(Pid) -> invoke_no_result([Pid], FunOrMFA); @@ -139,7 +139,7 @@ invoke_no_result(Pid, FunOrMFA) when is_pid(Pid) -> invoke_no_result([], _FunOrMFA) -> %% optimisation ok; invoke_no_result([Pid], FunOrMFA) when node(Pid) =:= node() -> %% optimisation - safe_invoke(Pid, FunOrMFA), %% must not die + _ = safe_invoke(Pid, FunOrMFA), %% must not die ok; invoke_no_result(Pids, FunOrMFA) when is_list(Pids) -> {LocalPids, Grouped} = group_pids_by_node(Pids), @@ -149,7 +149,7 @@ invoke_no_result(Pids, FunOrMFA) when is_list(Pids) -> RemoteNodes, delegate(self(), RemoteNodes), {invoke, FunOrMFA, Grouped}) end, - safe_invoke(LocalPids, FunOrMFA), %% must not die + _ = safe_invoke(LocalPids, FunOrMFA), %% must not die ok. monitor(process, Pid) when node(Pid) =:= node() -> @@ -247,7 +247,7 @@ handle_cast({demonitor, MonitoringPid, Pid}, {noreply, State#state{monitors = Monitors1}, hibernate}; handle_cast({invoke, FunOrMFA, Grouped}, State = #state{node = Node}) -> - safe_invoke(orddict:fetch(Node, Grouped), FunOrMFA), + _ = safe_invoke(orddict:fetch(Node, Grouped), FunOrMFA), {noreply, State, hibernate}. handle_info({'DOWN', Ref, process, Pid, Info}, diff --git a/src/dtree.erl b/src/dtree.erl index 0fef3b2d1f..5e219ade53 100644 --- a/src/dtree.erl +++ b/src/dtree.erl @@ -69,7 +69,7 @@ empty() -> {gb_trees:empty(), gb_trees:empty()}. %% primary key. insert(PK, [], V, {P, S}) -> %% dummy insert to force error if PK exists - gb_trees:insert(PK, {gb_sets:empty(), V}, P), + _ = gb_trees:insert(PK, {gb_sets:empty(), V}, P), {P, S}; insert(PK, SKs, V, {P, S}) -> {gb_trees:insert(PK, {gb_sets:from_list(SKs), V}, P), diff --git a/src/gatherer.erl b/src/gatherer.erl index 89bd46ca37..ecc2ab6189 100644 --- a/src/gatherer.erl +++ b/src/gatherer.erl @@ -120,8 +120,8 @@ handle_call(Msg, _From, State) -> handle_cast(finish, State = #gstate { forks = Forks, blocked = Blocked }) -> NewForks = Forks - 1, NewBlocked = case NewForks of - 0 -> [gen_server2:reply(From, empty) || - From <- queue:to_list(Blocked)], + 0 -> _ = [gen_server2:reply(From, empty) || + From <- queue:to_list(Blocked)], queue:new(); _ -> Blocked end, diff --git a/src/gm.erl b/src/gm.erl index dbf9c295f9..0ca0d8d9da 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -552,7 +552,7 @@ forget_group(GroupName) -> init([GroupName, Module, Args, TxnFun]) -> put(process_name, {?MODULE, GroupName}), {MegaSecs, Secs, MicroSecs} = now(), - random:seed(MegaSecs, Secs, MicroSecs), + _ = random:seed(MegaSecs, Secs, MicroSecs), Self = make_member(GroupName), gen_server2:cast(self(), join), {ok, #state { self = Self, @@ -901,7 +901,7 @@ ensure_broadcast_timer(State = #state { broadcast_buffer = [], State; ensure_broadcast_timer(State = #state { broadcast_buffer = [], broadcast_timer = TRef }) -> - erlang:cancel_timer(TRef), + _ = erlang:cancel_timer(TRef), State #state { broadcast_timer = undefined }; ensure_broadcast_timer(State = #state { broadcast_timer = undefined }) -> TRef = erlang:send_after(?BROADCAST_TIMER, self(), flush), @@ -1486,7 +1486,7 @@ maybe_confirm(_Self, _Id, Confirms, _PubNums) -> Confirms. purge_confirms(Confirms) -> - [gen_server2:reply(From, ok) || {_PubNum, From} <- queue:to_list(Confirms)], + _ = [gen_server2:reply(From, ok) || {_PubNum, From} <- queue:to_list(Confirms)], queue:new(). diff --git a/src/mirrored_supervisor.erl b/src/mirrored_supervisor.erl index 96c1418791..8df90391a0 100644 --- a/src/mirrored_supervisor.erl +++ b/src/mirrored_supervisor.erl @@ -347,7 +347,7 @@ handle_cast({ensure_monitoring, Pid}, State) -> {noreply, State}; handle_cast({die, Reason}, State = #state{group = Group}) -> - tell_all_peers_to_die(Group, Reason), + _ = tell_all_peers_to_die(Group, Reason), {stop, Reason, State}; handle_cast(Msg, State) -> @@ -364,7 +364,7 @@ handle_info({'DOWN', _Ref, process, Pid, Reason}, %% %% Therefore if we get here we know we need to cause the entire %% mirrored sup to shut down, not just fail over. - tell_all_peers_to_die(Group, Reason), + _ = tell_all_peers_to_die(Group, Reason), {stop, Reason, State}; handle_info({'DOWN', _Ref, process, Pid, _Reason}, @@ -411,14 +411,14 @@ maybe_start(Group, TxFun, Overall, Delegate, ChildSpec) -> check_start(Group, Overall, Delegate, ChildSpec) -> case mnesia:wread({?TABLE, {Group, id(ChildSpec)}}) of - [] -> write(Group, Overall, ChildSpec), + [] -> _ = write(Group, Overall, ChildSpec), start; [S] -> #mirrored_sup_childspec{key = {Group, Id}, mirroring_pid = Pid} = S, case Overall of Pid -> child(Delegate, Id); _ -> case supervisor(Pid) of - dead -> write(Group, Overall, ChildSpec), + dead -> _ = write(Group, Overall, ChildSpec), start; Delegate0 -> child(Delegate0, Id) end diff --git a/src/mnesia_sync.erl b/src/mnesia_sync.erl index 153017bca8..8b1dc33a96 100644 --- a/src/mnesia_sync.erl +++ b/src/mnesia_sync.erl @@ -65,7 +65,7 @@ handle_cast(Request, State) -> handle_info(timeout, #state{waiting = Waiting} = State) -> ok = disk_log:sync(latest_log), - [gen_server:reply(From, ok) || From <- Waiting], + _ = [gen_server:reply(From, ok) || From <- Waiting], {noreply, State#state{waiting = []}}; handle_info(Message, State) -> {stop, {unhandled_info, Message}, State}. diff --git a/src/pg2_fixed.erl b/src/pg2_fixed.erl index 8926b83b77..7b6533e851 100644 --- a/src/pg2_fixed.erl +++ b/src/pg2_fixed.erl @@ -51,7 +51,7 @@ start() -> -spec create(term()) -> 'ok'. create(Name) -> - ensure_started(), + _ = ensure_started(), case ets:member(pg2_fixed_table, {group, Name}) of false -> global:trans({{?MODULE, Name}, self()}, @@ -68,7 +68,7 @@ create(Name) -> -spec delete(name()) -> 'ok'. delete(Name) -> - ensure_started(), + _ = ensure_started(), global:trans({{?MODULE, Name}, self()}, fun() -> gen_server:multi_call(?MODULE, {delete, Name}) @@ -78,7 +78,7 @@ delete(Name) -> -spec join(name(), pid()) -> 'ok' | {'error', {'no_such_group', term()}}. join(Name, Pid) when is_pid(Pid) -> - ensure_started(), + _ = ensure_started(), case ets:member(pg2_fixed_table, {group, Name}) of false -> {error, {no_such_group, Name}}; @@ -94,7 +94,7 @@ join(Name, Pid) when is_pid(Pid) -> -spec leave(name(), pid()) -> 'ok' | {'error', {'no_such_group', name()}}. leave(Name, Pid) when is_pid(Pid) -> - ensure_started(), + _ = ensure_started(), case ets:member(pg2_fixed_table, {group, Name}) of false -> {error, {no_such_group, Name}}; @@ -110,9 +110,9 @@ leave(Name, Pid) when is_pid(Pid) -> -type get_members_ret() :: [pid()] | {'error', {'no_such_group', name()}}. -spec get_members(name()) -> get_members_ret(). - + get_members(Name) -> - ensure_started(), + _ = ensure_started(), case ets:member(pg2_fixed_table, {group, Name}) of true -> group_members(Name); @@ -123,7 +123,7 @@ get_members(Name) -> -spec get_local_members(name()) -> get_members_ret(). get_local_members(Name) -> - ensure_started(), + _ = ensure_started(), case ets:member(pg2_fixed_table, {group, Name}) of true -> local_group_members(Name); @@ -134,7 +134,7 @@ get_local_members(Name) -> -spec which_groups() -> [name()]. which_groups() -> - ensure_started(), + _ = ensure_started(), all_groups(). -type gcp_error_reason() :: {'no_process', term()} | {'no_such_group', term()}. @@ -169,7 +169,7 @@ get_closest_pid(Name) -> init([]) -> Ns = nodes(), - net_kernel:monitor_nodes(true), + _ = net_kernel:monitor_nodes(true), lists:foreach(fun(N) -> {?MODULE, N} ! {new_pg2_fixed, node()}, self() ! {nodeup, N} @@ -182,7 +182,7 @@ init([]) -> | {'join', name(), pid()} | {'leave', name(), pid()}. --spec handle_call(call(), _, #state{}) -> +-spec handle_call(call(), _, #state{}) -> {'reply', 'ok', #state{}}. handle_call({create, Name}, _From, S) -> @@ -190,7 +190,8 @@ handle_call({create, Name}, _From, S) -> {reply, ok, S}; handle_call({join, Name, Pid}, _From, S) -> case ets:member(pg2_fixed_table, {group, Name}) of - true -> join_group(Name, Pid); + true -> _ = join_group(Name, Pid), + ok; _ -> ok end, {reply, ok, S}; @@ -205,7 +206,7 @@ handle_call({delete, Name}, _From, S) -> {reply, ok, S}; handle_call(Request, From, S) -> error_logger:warning_msg("The pg2_fixed server received an unexpected message:\n" - "handle_call(~p, ~p, _)\n", + "handle_call(~p, ~p, _)\n", [Request, From]), {noreply, S}. @@ -265,12 +266,10 @@ terminate(_Reason, _S) -> %%% Pid is a member of group Name. store(List) -> - _ = [case assure_group(Name) of - true -> - [join_group(Name, P) || P <- Members -- group_members(Name)]; - _ -> - ok - end || [Name, Members] <- List], + _ = [assure_group(Name) + andalso + [join_group(Name, P) || P <- Members -- group_members(Name)] || + [Name, Members] <- List], ok. assure_group(Name) -> @@ -285,7 +284,7 @@ delete_group(Name) -> member_died(Ref) -> [{{ref, Ref}, Pid}] = ets:lookup(pg2_fixed_table, {ref, Ref}), Names = member_groups(Pid), - _ = [leave_group(Name, P) || + _ = [leave_group(Name, P) || Name <- Names, P <- member_in_group(Pid, Name)], %% Kept for backward compatibility with links. Can be removed, eventually. @@ -294,7 +293,7 @@ member_died(Ref) -> ok. join_group(Name, Pid) -> - Ref_Pid = {ref, Pid}, + Ref_Pid = {ref, Pid}, try _ = ets:update_counter(pg2_fixed_table, Ref_Pid, {4, +1}) catch _:_ -> {RPid, Ref} = do_monitor(Pid), @@ -314,7 +313,7 @@ leave_group(Name, Pid) -> Member_Name_Pid = {member, Name, Pid}, try ets:update_counter(pg2_fixed_table, Member_Name_Pid, {2, -1, 0, 0}) of N -> - if + if N =:= 0 -> true = ets:delete(pg2_fixed_table, {pid, Pid, Name}), _ = [ets:delete(pg2_fixed_table, {local_member, Name, Pid}) || @@ -323,7 +322,7 @@ leave_group(Name, Pid) -> true -> ok end, - Ref_Pid = {ref, Pid}, + Ref_Pid = {ref, Pid}, case ets:update_counter(pg2_fixed_table, Ref_Pid, {4, -1}) of 0 -> [{Ref_Pid,RPid,Ref,0}] = ets:lookup(pg2_fixed_table, Ref_Pid), @@ -342,12 +341,12 @@ all_members() -> [[G, group_members(G)] || G <- all_groups()]. group_members(Name) -> - [P || + [P || [P, N] <- ets:match(pg2_fixed_table, {{member, Name, '$1'},'$2'}), _ <- lists:seq(1, N)]. local_group_members(Name) -> - [P || + [P || [Pid] <- ets:match(pg2_fixed_table, {{local_member, Name, '$1'}}), P <- member_in_group(Pid, Name)]. @@ -389,9 +388,9 @@ do_monitor(Pid) -> %% Assume the node is still up {Pid, erlang:monitor(process, Pid)}; false -> - F = fun() -> + F = fun() -> Ref = erlang:monitor(process, Pid), - receive + receive {'DOWN', Ref, process, Pid, _Info} -> exit(normal) end diff --git a/src/pg_local.erl b/src/pg_local.erl index 4d9914d9b7..62fae2b077 100644 --- a/src/pg_local.erl +++ b/src/pg_local.erl @@ -16,20 +16,20 @@ %% All modifications are (C) 2010-2013 GoPivotal, Inc. %% %CopyrightBegin% -%% +%% %% Copyright Ericsson AB 1997-2009. All Rights Reserved. -%% +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% -module(pg_local). @@ -71,19 +71,19 @@ start() -> ensure_started(). join(Name, Pid) when is_pid(Pid) -> - ensure_started(), + _ = ensure_started(), gen_server:cast(?MODULE, {join, Name, Pid}). leave(Name, Pid) when is_pid(Pid) -> - ensure_started(), + _ = ensure_started(), gen_server:cast(?MODULE, {leave, Name, Pid}). get_members(Name) -> - ensure_started(), + _ = ensure_started(), group_members(Name). in_group(Name, Pid) -> - ensure_started(), + _ = ensure_started(), %% The join message is a cast and thus can race, but we want to %% keep it that way to be fast in the common case. case member_present(Name, Pid) of @@ -93,7 +93,7 @@ in_group(Name, Pid) -> end. sync() -> - ensure_started(), + _ = ensure_started(), gen_server:call(?MODULE, sync, infinity). %%% @@ -111,12 +111,12 @@ handle_call(sync, _From, S) -> handle_call(Request, From, S) -> error_logger:warning_msg("The pg_local server received an unexpected message:\n" - "handle_call(~p, ~p, _)\n", + "handle_call(~p, ~p, _)\n", [Request, From]), {noreply, S}. handle_cast({join, Name, Pid}, S) -> - join_group(Name, Pid), + _ = join_group(Name, Pid), {noreply, S}; handle_cast({leave, Name, Pid}, S) -> leave_group(Name, Pid), @@ -155,13 +155,13 @@ terminate(_Reason, _S) -> member_died(Ref) -> [{{ref, Ref}, Pid}] = ets:lookup(pg_local_table, {ref, Ref}), Names = member_groups(Pid), - _ = [leave_group(Name, P) || + _ = [leave_group(Name, P) || Name <- Names, P <- member_in_group(Pid, Name)], ok. join_group(Name, Pid) -> - Ref_Pid = {ref, Pid}, + Ref_Pid = {ref, Pid}, try _ = ets:update_counter(pg_local_table, Ref_Pid, {3, +1}) catch _:_ -> Ref = erlang:monitor(process, Pid), @@ -179,14 +179,14 @@ leave_group(Name, Pid) -> Member_Name_Pid = {member, Name, Pid}, try ets:update_counter(pg_local_table, Member_Name_Pid, {2, -1}) of N -> - if + if N =:= 0 -> true = ets:delete(pg_local_table, {pid, Pid, Name}), true = ets:delete(pg_local_table, Member_Name_Pid); true -> ok end, - Ref_Pid = {ref, Pid}, + Ref_Pid = {ref, Pid}, case ets:update_counter(pg_local_table, Ref_Pid, {3, -1}) of 0 -> [{Ref_Pid,Ref,0}] = ets:lookup(pg_local_table, Ref_Pid), @@ -202,7 +202,7 @@ leave_group(Name, Pid) -> end. group_members(Name) -> - [P || + [P || [P, N] <- ets:match(pg_local_table, {{member, Name, '$1'},'$2'}), _ <- lists:seq(1, N)]. diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 508153969e..6dab49dd3e 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -394,7 +394,7 @@ sysctl(Def) -> read_proc_file(File) -> {ok, IoDevice} = file:open(File, [read, raw]), Res = read_proc_file(IoDevice, []), - file:close(IoDevice), + _ = file:close(IoDevice), lists:flatten(lists:reverse(Res)). -define(BUFFER_SIZE, 1024). |
