summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Videla <videlalvaro@gmail.com>2015-08-27 19:04:34 +0200
committerAlvaro Videla <videlalvaro@gmail.com>2015-08-27 19:04:34 +0200
commit77bb3ee447b804ceb12647b37bbaca369f79dead (patch)
treea13faa1aa0ff41baa29a6ab3a15cfcade9b71eee
parent7b841803f39a005671a7f603b95ec99570d086de (diff)
downloadrabbitmq-server-git-77bb3ee447b804ceb12647b37bbaca369f79dead.tar.gz
refactors DeltaRam calculation from stats0
-rw-r--r--src/rabbit_variable_queue.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 682b9e0eb2..1a0521d184 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -1243,12 +1243,7 @@ stats0({DeltaReady, DeltaUnacked, ReadyMsgPaged},
persistent_bytes = PersistentBytes}) ->
S = msg_size(MsgStatus),
DeltaTotal = DeltaReady + DeltaUnacked,
- DeltaRam = case {InRamBefore, InRamAfter} of
- {false, false} -> 0;
- {false, true} -> 1;
- {true, false} -> -1;
- {true, true} -> 0
- end,
+ DeltaRam = delta_ram(InRamBefore, InRamAfter),
DeltaRamReady = case DeltaReady of
1 -> one_if(InRamAfter);
-1 -> -one_if(InRamBefore);
@@ -1268,6 +1263,12 @@ msg_size(#msg_status{msg_props = #message_properties{size = Size}}) -> Size.
msg_in_ram(#msg_status{msg = Msg}) -> Msg =/= undefined.
+%% delta_ram(InRamBefore, InRamAfter)
+delta_ram(false, false) -> 0;
+delta_ram(false, true) -> 1;
+delta_ram(true, false) -> -1;
+delta_ram(true, true) -> 0.
+
remove(AckRequired, MsgStatus = #msg_status {
seq_id = SeqId,
msg_id = MsgId,