diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-17 13:01:24 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-17 13:01:24 +0100 |
commit | 483b5c9dbbaee6c6118aa3c45dc3866cb45da41d (patch) | |
tree | 28035c16ddd0dfbe950ab80a6794dc7b574b616b | |
parent | 675b478fd091ba29dbafe7f1e3f2aae0b50fe520 (diff) | |
download | rabbitmq-server-483b5c9dbbaee6c6118aa3c45dc3866cb45da41d.tar.gz |
go back to from members_changed/4 to /3
-rw-r--r-- | include/gm_specs.hrl | 3 | ||||
-rw-r--r-- | src/gm.erl | 12 | ||||
-rw-r--r-- | src/gm_soak_test.erl | 4 | ||||
-rw-r--r-- | src/gm_speed_test.erl | 4 | ||||
-rw-r--r-- | src/gm_tests.erl | 4 | ||||
-rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 6 | ||||
-rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 6 |
7 files changed, 18 insertions, 21 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl index f4ea0df8..245c23bc 100644 --- a/include/gm_specs.hrl +++ b/include/gm_specs.hrl @@ -21,8 +21,7 @@ -type(members() :: [pid()]). -spec(joined/2 :: (args(), members()) -> callback_result()). --spec(members_changed/4 :: (args(), members(), - members(), members()) -> callback_result()). +-spec(members_changed/3 :: (args(), members(), members()) -> callback_result()). -spec(handle_msg/3 :: (args(), pid(), any()) -> callback_result()). -spec(terminate/2 :: (args(), term()) -> any()). @@ -476,8 +476,8 @@ %% joined/2 before receiving any messages from it; and (2) we will not %% see members die that we have not seen born (or supplied in the %% members to joined/2). --callback members_changed(Args :: term(), Births :: [pid()], - Deaths :: [pid()], Live :: [pid()]) -> +-callback members_changed(Args :: term(), + Births :: [pid()], Deaths :: [pid()]) -> ok | {stop, Reason :: term()} | {become, Module :: atom(), Args :: any()}. %% Supplied with Args provided in start_link, the sender, and the @@ -496,7 +496,7 @@ -else. behaviour_info(callbacks) -> - [{joined, 2}, {members_changed, 4}, {handle_msg, 3}, {terminate, 2}]; + [{joined, 2}, {members_changed, 3}, {handle_msg, 3}, {terminate, 2}]; behaviour_info(_Other) -> undefined. @@ -685,8 +685,7 @@ handle_cast({validate_members, OldMembers}, Deaths = OldMembers -- NewMembers, case {Births, Deaths} of {[], []} -> noreply(State); - _ -> Result = Module:members_changed( - Args, Births, Deaths, NewMembers), + _ -> Result = Module:members_changed(Args, Births, Deaths), handle_callback_result({Result, State}) end; @@ -1399,8 +1398,7 @@ callback_view_changed(Args, Module, OldView, NewView) -> case {Births, Deaths} of {[], []} -> ok; _ -> Module:members_changed( - Args, get_pids(Births), get_pids(Deaths), - get_pids(NewMembers)) + Args, get_pids(Births), get_pids(Deaths)) end. handle_callback_result({Result, State}) -> diff --git a/src/gm_soak_test.erl b/src/gm_soak_test.erl index 4ff1645a..c9a25522 100644 --- a/src/gm_soak_test.erl +++ b/src/gm_soak_test.erl @@ -17,7 +17,7 @@ -module(gm_soak_test). -export([test/0]). --export([joined/2, members_changed/4, handle_msg/3, terminate/2]). +-export([joined/2, members_changed/3, handle_msg/3, terminate/2]). -behaviour(gm). @@ -51,7 +51,7 @@ joined([], Members) -> put(ts, now()), ok. -members_changed([], Births, Deaths, _Live) -> +members_changed([], Births, Deaths) -> with_state( fun (State) -> State1 = diff --git a/src/gm_speed_test.erl b/src/gm_speed_test.erl index fa515fa8..41be6dd8 100644 --- a/src/gm_speed_test.erl +++ b/src/gm_speed_test.erl @@ -17,7 +17,7 @@ -module(gm_speed_test). -export([test/3]). --export([joined/2, members_changed/4, handle_msg/3, terminate/2]). +-export([joined/2, members_changed/3, handle_msg/3, terminate/2]). -export([wile_e_coyote/2]). -behaviour(gm). @@ -30,7 +30,7 @@ joined(Owner, _Members) -> Owner ! joined, ok. -members_changed(_Owner, _Births, _Deaths, _Live) -> +members_changed(_Owner, _Births, _Deaths) -> ok. handle_msg(Owner, _From, ping) -> diff --git a/src/gm_tests.erl b/src/gm_tests.erl index 23b8f8cb..cae2164b 100644 --- a/src/gm_tests.erl +++ b/src/gm_tests.erl @@ -22,7 +22,7 @@ test_member_death/0, test_receive_in_order/0, all_tests/0]). --export([joined/2, members_changed/4, handle_msg/3, terminate/2]). +-export([joined/2, members_changed/3, handle_msg/3, terminate/2]). -behaviour(gm). @@ -40,7 +40,7 @@ joined(Pid, Members) -> Pid ! {joined, self(), Members}, ok. -members_changed(Pid, Births, Deaths, _Live) -> +members_changed(Pid, Births, Deaths) -> Pid ! {members_changed, self(), Births, Deaths}, ok. diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 71ce512e..23718da1 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -21,7 +21,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --export([joined/2, members_changed/4, handle_msg/3]). +-export([joined/2, members_changed/3, handle_msg/3]). -behaviour(gen_server2). -behaviour(gm). @@ -401,9 +401,9 @@ joined([CPid], Members) -> CPid ! {joined, self(), Members}, ok. -members_changed([_CPid], _Births, [], _Live) -> +members_changed([_CPid], _Births, []) -> ok; -members_changed([CPid], _Births, Deaths, _Live) -> +members_changed([CPid], _Births, Deaths) -> ok = gen_server2:cast(CPid, {gm_deaths, Deaths}). handle_msg([CPid], _From, request_depth = Msg) -> diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index fbdcb979..5509a51c 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -30,7 +30,7 @@ code_change/3, handle_pre_hibernate/1, prioritise_call/4, prioritise_cast/3, prioritise_info/3, format_message_queue/2]). --export([joined/2, members_changed/4, handle_msg/3]). +-export([joined/2, members_changed/3, handle_msg/3]). -behaviour(gen_server2). -behaviour(gm). @@ -393,9 +393,9 @@ format_message_queue(Opt, MQ) -> rabbit_misc:format_message_queue(Opt, MQ). joined([SPid], _Members) -> SPid ! {joined, self()}, ok. -members_changed([_SPid], _Births, [], _Live) -> +members_changed([_SPid], _Births, []) -> ok; -members_changed([ SPid], _Births, Deaths, _Live) -> +members_changed([ SPid], _Births, Deaths) -> case rabbit_misc:with_exit_handler( rabbit_misc:const(ok), fun() -> |