diff options
| author | Gabriele Santomaggio <gabriele.santomaggio@erlang-solutions.com> | 2016-09-26 16:48:23 +0200 |
|---|---|---|
| committer | Gabriele Santomaggio <gabriele.santomaggio@erlang-solutions.com> | 2016-09-26 16:48:23 +0200 |
| commit | 1215682ac2896ddafee14ba4ea2ed6811882e5f9 (patch) | |
| tree | ebd1cbd2debae2ec075a1bc66decf7f754852b26 | |
| parent | 5bbc6dd4d73aaf96173cc60a9ad7feb8ef695dc1 (diff) | |
| download | rabbitmq-server-git-1215682ac2896ddafee14ba4ea2ed6811882e5f9.tar.gz | |
renamed run_count to gc_run_count
| -rw-r--r-- | src/rabbit.app.src | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src index 4b1c30b1b4..c1dcb93bcc 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -101,5 +101,5 @@ %% and rabbitmq-server#667 {channel_operation_timeout, 15000}, %% rabbitmq-server-973 - {gc_default_threshold, 250} + {gc_run_default_threshold, 250} ]}]}. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index f943a66c04..bb654094f7 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -309,7 +309,7 @@ mode, % number of executions to reach the GC_THRESHOLD, % see: maybe_execute_gc/1 - run_count + gc_run_count }). -record(rates, { in, out, ack_in, ack_out, timestamp }). @@ -406,7 +406,7 @@ io_batch_size :: pos_integer(), mode :: 'default' | 'lazy', - run_count :: non_neg_integer()}. + gc_run_count :: non_neg_integer()}. %% Duplicated from rabbit_backing_queue -spec ack([ack()], state()) -> {[rabbit_guid:guid()], state()}. @@ -436,12 +436,12 @@ %% it needs to tune the GC calls inside `reduce_memory_use` %% see: rabbitmq-server-973 and `maybe_execute_gc` function -define(DEFAULT_INITIAL_GC_THRESHOLD, 250). --define(GC_THRESHOLD, - case get(gc_default_threshold) of +-define(GC_RUN_THRESHOLD, + case get(gc_run_default_threshold) of undefined -> - Val = rabbit_misc:get_env(rabbit, gc_default_threshold, + Val = rabbit_misc:get_env(rabbit, gc_run_default_threshold, ?DEFAULT_INITIAL_GC_THRESHOLD), - put(gc_default_threshold, Val), + put(gc_run_default_threshold, Val), Val; Val -> Val end). @@ -1350,7 +1350,7 @@ init(IsDurable, IndexState, DeltaCount, DeltaBytes, Terms, io_batch_size = IoBatchSize, mode = default, - run_count = 0}, + gc_run_count = 0}, a(maybe_deltas_to_betas(State)). blank_rates(Now) -> @@ -2284,11 +2284,11 @@ ifold(Fun, Acc, Its, State) -> %% Phase changes %%---------------------------------------------------------------------------- -maybe_execute_gc(State = #vqstate {run_count = RunCount}) -> - case RunCount >= ?GC_THRESHOLD of +maybe_execute_gc(State = #vqstate {gc_run_count = GCRunCount}) -> + case GCRunCount >= ?GC_RUN_THRESHOLD of true -> garbage_collect(), - State#vqstate{run_count = 0}; - false -> State#vqstate{run_count = RunCount + 1} + State#vqstate{gc_run_count = 0}; + false -> State#vqstate{gc_run_count = GCRunCount + 1} end. |