diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2010-11-04 12:32:21 +0000 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2010-11-04 12:32:21 +0000 |
| commit | c70c248fb698be85b8c30e4b9d20dd154e353091 (patch) | |
| tree | ce6662c3b8ed7e12022dfebb8889bbbc6db26878 | |
| parent | f0eaffef9b6eefb01721deb88d8c7b98c5753875 (diff) | |
| download | rabbitmq-server-c70c248fb698be85b8c30e4b9d20dd154e353091.tar.gz | |
clean up
| -rw-r--r-- | src/rabbit_variable_queue.erl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 3a8a913f..3b3f9c8d 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1248,7 +1248,7 @@ record_pending_ack(#msg_status { seq_id = SeqId, ack_in_counter = AckInCount}) -> {AckEntry, RAI1} = case MsgOnDisk of - true -> + true -> {{IsPersistent, Guid, MsgProps}, RAI}; false -> {MsgStatus, gb_trees:insert(SeqId, Guid, RAI)} @@ -1364,11 +1364,14 @@ reduce_memory_use(AlphaBetaFun, BetaGammaFun, BetaDeltaFun, AckFun, State) -> end end. -reduce_ack_memory_use(_AckFun, State = #vqstate { target_ram_msg_count = infinity }) -> +reduce_ack_memory_use(_AckFun, + State = #vqstate { target_ram_msg_count = infinity }) -> {false, State}; -reduce_ack_memory_use(AckFun, State = #vqstate {target_ram_msg_count = TargetRamMsgCount, - ram_msg_count = RamMsgCount, - ram_ack_index = RamAckIndex} ) -> +reduce_ack_memory_use(AckFun, + State = #vqstate { + target_ram_msg_count = TargetRamMsgCount, + ram_msg_count = RamMsgCount, + ram_ack_index = RamAckIndex} ) -> PermittedAckCount = case TargetRamMsgCount > RamMsgCount of true -> TargetRamMsgCount - RamMsgCount; false -> 0 @@ -1395,7 +1398,7 @@ limit_ram_acks(Quota, State = #vqstate { pending_ack = PA, {_, State1} = maybe_write_to_disk(true, false, MsgStatus, State), limit_ram_acks(Quota - 1, State1 #vqstate { - pending_ack = + pending_ack = dict:store(SeqId, {false, Guid, MsgProps}, PA), ram_ack_index = RAI1 }) end. |