summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-02-20 20:11:20 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-02-20 20:11:20 +0000
commita18a941f0a8d06e310fd03787d3c35ce82cdeec5 (patch)
treea4e90468c0466738166dfeff658b3591743f2fb7
parente0644af6536f224cbf9a9eac7bb158e1f767f23b (diff)
downloadrabbitmq-server-a18a941f0a8d06e310fd03787d3c35ce82cdeec5.tar.gz
cosmetic
move functions to a better place
-rw-r--r--src/rabbit_amqqueue_process.erl28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 830ad35b..c822c2e7 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -402,20 +402,6 @@ erase_ch_record(#cr{ch_pid = ChPid,
erase({ch, ChPid}),
ok.
-maybe_send_drained(WasEmpty, State) ->
- case WasEmpty andalso is_empty(State) of
- true -> [send_drained(C) || C <- all_ch_record()];
- false -> ok
- end.
-
-send_drained(C = #cr{ch_pid = ChPid, limiter = Limiter}) ->
- case rabbit_limiter:drained(Limiter) of
- {[], Limiter} -> ok;
- {CTagCredit, Limiter2} -> rabbit_channel:send_drained(
- ChPid, CTagCredit),
- update_ch_record(C#cr{limiter = Limiter2})
- end.
-
update_consumer_count(C = #cr{consumer_count = 0, limiter = Limiter}, +1) ->
ok = rabbit_limiter:register(Limiter, self()),
update_ch_record(C#cr{consumer_count = 1});
@@ -434,6 +420,20 @@ block_consumer(C = #cr{blocked_consumers = Blocked}, QEntry) ->
is_ch_blocked(#cr{unsent_message_count = Count, is_limit_active = Limited}) ->
Limited orelse Count >= ?UNSENT_MESSAGE_LIMIT.
+maybe_send_drained(WasEmpty, State) ->
+ case WasEmpty andalso is_empty(State) of
+ true -> [send_drained(C) || C <- all_ch_record()];
+ false -> ok
+ end.
+
+send_drained(C = #cr{ch_pid = ChPid, limiter = Limiter}) ->
+ case rabbit_limiter:drained(Limiter) of
+ {[], Limiter} -> ok;
+ {CTagCredit, Limiter2} -> rabbit_channel:send_drained(
+ ChPid, CTagCredit),
+ update_ch_record(C#cr{limiter = Limiter2})
+ end.
+
deliver_msgs_to_consumers(_DeliverFun, true, State) ->
{true, State};
deliver_msgs_to_consumers(DeliverFun, false,