diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-06-14 08:43:26 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-06-14 08:43:26 +0100 |
| commit | 872e74eb90f2d001ae2e4e92f981dc6b6cb2a6a0 (patch) | |
| tree | a52eb175fcb0dba1e570c8123996718500ea47da | |
| parent | b402675bad2927026351612494016545f2d6893d (diff) | |
| download | rabbitmq-server-git-872e74eb90f2d001ae2e4e92f981dc6b6cb2a6a0.tar.gz | |
cosmetic: more sensible ordering of state components
essential vars first, followed by derived vars and counters/rates/etc
| -rw-r--r-- | src/rabbit_variable_queue.erl | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 20ef326ea0..0a3a3d2362 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -172,27 +172,29 @@ delta, q3, q4, + next_seq_id, + pending_ack, + index_state, + msg_store_clients, + on_sync, + durable, + transient_threshold, + + len, + persistent_count, + duration_target, target_ram_msg_count, ram_msg_count, ram_msg_count_prev, ram_index_count, - index_state, - next_seq_id, out_counter, in_counter, egress_rate, avg_egress_rate, ingress_rate, avg_ingress_rate, - rate_timestamp, - len, - on_sync, - msg_store_clients, - persistent_count, - transient_threshold, - pending_ack, - durable + rate_timestamp }). -record(msg_status, @@ -244,13 +246,24 @@ delta :: delta(), q3 :: bpqueue(), q4 :: queue(), + next_seq_id :: seq_id(), + pending_ack :: dict(), + index_state :: any(), + msg_store_clients :: 'undefined' | {{any(), binary()}, + {any(), binary()}}, + on_sync :: {[[ack()]], [[guid()]], + [fun (() -> any())]}, + durable :: boolean(), + + len :: non_neg_integer(), + persistent_count :: non_neg_integer(), + + transient_threshold :: non_neg_integer(), duration_target :: non_neg_integer(), target_ram_msg_count :: non_neg_integer(), ram_msg_count :: non_neg_integer(), ram_msg_count_prev :: non_neg_integer(), ram_index_count :: non_neg_integer(), - index_state :: any(), - next_seq_id :: seq_id(), out_counter :: non_neg_integer(), in_counter :: non_neg_integer(), egress_rate :: {{integer(), integer(), integer()}, @@ -259,16 +272,7 @@ ingress_rate :: {{integer(), integer(), integer()}, non_neg_integer()}, avg_ingress_rate :: float(), - rate_timestamp :: {integer(), integer(), integer()}, - len :: non_neg_integer(), - on_sync :: {[[ack()]], [[guid()]], - [fun (() -> any())]}, - msg_store_clients :: 'undefined' | {{any(), binary()}, - {any(), binary()}}, - persistent_count :: non_neg_integer(), - transient_threshold :: non_neg_integer(), - pending_ack :: dict(), - durable :: boolean() + rate_timestamp :: {integer(), integer(), integer()} }). -include("rabbit_backing_queue_spec.hrl"). @@ -339,28 +343,30 @@ init(QueueName, IsDurable, _Recover) -> delta = Delta, q3 = bpqueue:new(), q4 = queue:new(), + next_seq_id = NextSeqId, + pending_ack = dict:new(), + index_state = IndexState1, + msg_store_clients = {{PersistentClient, PRef}, + {TransientClient, TRef}}, + on_sync = {[], [], []}, + durable = IsDurable, + transient_threshold = NextSeqId, + + len = DeltaCount1, + persistent_count = DeltaCount1, + duration_target = undefined, target_ram_msg_count = undefined, ram_msg_count = 0, ram_msg_count_prev = 0, ram_index_count = 0, - index_state = IndexState1, - next_seq_id = NextSeqId, out_counter = 0, in_counter = 0, egress_rate = {Now, 0}, avg_egress_rate = 0, ingress_rate = {Now, DeltaCount1}, avg_ingress_rate = 0, - rate_timestamp = Now, - len = DeltaCount1, - on_sync = {[], [], []}, - msg_store_clients = {{PersistentClient, PRef}, - {TransientClient, TRef}}, - persistent_count = DeltaCount1, - transient_threshold = NextSeqId, - pending_ack = dict:new(), - durable = IsDurable + rate_timestamp = Now }, maybe_deltas_to_betas(State). |