diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index 46a37899e8..6965984809 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -247,10 +247,11 @@ subtract_acks(ChPid, AckTags, State) -> not_found -> not_found; C = #cr{acktags = ChAckTags, limiter = Lim} -> - {CTagCounts, AckTags2} = subtract_acks(AckTags, [], [], ChAckTags), + {CTagCounts, AckTags2} = subtract_acks( + AckTags, [], orddict:new(), ChAckTags), {Unblocked, Lim2} = - lists:foldl( - fun ({CTag, Count}, {UnblockedN, LimN}) -> + orddict:fold( + fun (CTag, Count, {UnblockedN, LimN}) -> {Unblocked1, LimN1} = rabbit_limiter:ack_from_queue(LimN, CTag, Count), {UnblockedN orelse Unblocked1, LimN1} @@ -271,21 +272,12 @@ subtract_acks([T | TL] = AckTags, Prefix, CTagCounts, AckQ) -> case queue:out(AckQ) of {{value, {T, CTag}}, QTail} -> subtract_acks(TL, Prefix, - incr_ctag_count(CTag, CTagCounts), QTail); + orddict:update_counter(CTag, 1, CTagCounts), QTail); {{value, {AT, CTag}}, QTail} -> subtract_acks(AckTags, [AT | Prefix], - incr_ctag_count(CTag, CTagCounts), QTail) + orddict:update_counter(CTag, 1, CTagCounts), QTail) end. -incr_ctag_count(CTag, []) -> [{CTag, 1}]; -incr_ctag_count(CTag, [{CTag, N}]) -> [{CTag, N + 1}]; -incr_ctag_count(CTag, CTagCounts) -> case lists:keyfind(CTag, 1, CTagCounts) of - false -> [{CTag, 1} | CTagCounts]; - {CTag, N} -> [{CTag, N + 1} | - lists:keydelete( - CTag, 1, CTagCounts)] - end. - possibly_unblock(Update, ChPid, State) -> case lookup_ch(ChPid) of not_found -> unchanged; |