diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-01-21 13:03:11 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-01-21 13:03:11 +0000 |
| commit | 0e40b583638ec14811852aa3281df677c4b7ccdb (patch) | |
| tree | 57d2d531c1dc413250f126ad0fab2098c696d345 | |
| parent | 77b1a8bd799b20ed3c56bb1a5103f36f099385ac (diff) | |
| download | rabbitmq-server-0e40b583638ec14811852aa3281df677c4b7ccdb.tar.gz | |
rename variables for consistency
| -rw-r--r-- | src/rabbit_channel.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 5de9c055..ea380a4c 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -297,12 +297,12 @@ handle_info({'DOWN', _MRef, process, QPid, _Reason}, %% TODO: this does a complete scan and partial rebuild of the %% tree, which is quite efficient. To do better we'd need to %% maintain a secondary mapping, from QPids to MsgSeqNos. - {MEs, UC1} = remove_queue_unconfirmed( + {MXs, UC1} = remove_queue_unconfirmed( gb_trees:next(gb_trees:iterator(UC)), QPid, {[], UC}, State), erase_queue_stats(QPid), noreply( - queue_blocked(QPid, record_confirms(MEs, State#ch{unconfirmed = UC1}))). + queue_blocked(QPid, record_confirms(MXs, State#ch{unconfirmed = UC1}))). handle_pre_hibernate(State = #ch{stats_timer = StatsTimer}) -> ok = clear_permission_cache(), @@ -502,13 +502,13 @@ record_confirm(MsgSeqNo, XName, State) -> record_confirms([], State) -> State; -record_confirms(MEs, State = #ch{confirmed = C}) -> - State#ch{confirmed = [MEs | C]}. +record_confirms(MXs, State = #ch{confirmed = C}) -> + State#ch{confirmed = [MXs | C]}. confirm([], _QPid, State) -> State; confirm(MsgSeqNos, QPid, State = #ch{unconfirmed = UC}) -> - {MEs, UC1} = + {MXs, UC1} = lists:foldl( fun(MsgSeqNo, {_DMs, UC0} = Acc) -> case gb_trees:lookup(MsgSeqNo, UC0) of @@ -516,14 +516,14 @@ confirm(MsgSeqNos, QPid, State = #ch{unconfirmed = UC}) -> {value, XQ} -> remove_qmsg(MsgSeqNo, QPid, XQ, Acc, State) end end, {[], UC}, MsgSeqNos), - record_confirms(MEs, State#ch{unconfirmed = UC1}). + record_confirms(MXs, State#ch{unconfirmed = UC1}). -remove_qmsg(MsgSeqNo, QPid, {XName, Qs}, {MEs, UC}, State) -> +remove_qmsg(MsgSeqNo, QPid, {XName, Qs}, {MXs, UC}, State) -> Qs1 = sets:del_element(QPid, Qs), maybe_incr_stats([{{QPid, XName}, 1}], confirm, State), case sets:size(Qs1) of - 0 -> {[{MsgSeqNo, XName} | MEs], gb_trees:delete(MsgSeqNo, UC)}; - _ -> {MEs, gb_trees:update(MsgSeqNo, {XName, Qs1}, UC)} + 0 -> {[{MsgSeqNo, XName} | MXs], gb_trees:delete(MsgSeqNo, UC)}; + _ -> {MXs, gb_trees:update(MsgSeqNo, {XName, Qs1}, UC)} end. handle_method(#'channel.open'{}, _, State = #ch{state = starting}) -> |