diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-07-15 11:57:49 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-07-15 11:57:49 +0100 |
| commit | e4748cfe86ee72e683e4bab0e649c9fbc80ff645 (patch) | |
| tree | d663f75d0be5287feab00b5c42c8ca48366e7b4a | |
| parent | d4c113d3e387ae561283a79a61023325b4034985 (diff) | |
| parent | 8bd2ca80c00e4a34f4dddb72e5a516fa5d55ea46 (diff) | |
| download | rabbitmq-server-e4748cfe86ee72e683e4bab0e649c9fbc80ff645.tar.gz | |
Merge bug26286
| -rw-r--r-- | src/gm_qc.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gm_qc.erl b/src/gm_qc.erl index 96ef5035..394cbcbd 100644 --- a/src/gm_qc.erl +++ b/src/gm_qc.erl @@ -149,7 +149,7 @@ precondition(_S, {call, ?MODULE, do_proceed1, [_GM]}) -> precondition(_S, {call, ?MODULE, do_proceed2, [GM1, GM2]}) -> GM1 =/= GM2. -postcondition(S = #state{}, {call, _M, _F, _A}, _Res) -> +postcondition(_S, {call, _M, _F, _A}, _Res) -> true. next_state(S = #state{to_join = ToSet, @@ -163,12 +163,12 @@ next_state(S = #state{to_leave = Set}, _Res, {call, ?MODULE, do_leave, [GM]}) -> next_state(S = #state{seq = Seq, outstanding = Outstanding}, _Res, {call, ?MODULE, do_send, [GM]}) -> - case is_pid(GM) andalso lists:member(GM, gms(S)) of + case is_pid(GM) andalso lists:member(GM, gms_joined(S)) of true -> %% Dynamic state, i.e. runtime Msg = [{sequence, Seq}, {sent_to, GM}, - {dests, gms(S)}], + {dests, gms_joined(S)}], gm:broadcast(GM, Msg), Outstanding1 = dict:map( fun (_GM, Set) -> @@ -312,8 +312,6 @@ add_monitor(From, To, Ref, S = #state{monitors = Mons}) -> From ! {mref, Ref, MRef}, S#state{monitors = dict:store(MRef, From, Mons)}. -timestamp() -> timer:now_diff(os:timestamp(), {0, 0, 0}). - %% ---------------------------------------------------------------------------- %% Assertions %% ---------------------------------------------------------------------------- |