From 7a0cf22909df1130c7fc9564efa4fd5f40ca721f Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Thu, 22 Dec 2016 14:41:43 +0000 Subject: [PATCH] put-timing default Remove need for individual actors to know the defaults for put_timing tuple --- src/leveled_bookie.erl | 2 +- src/leveled_cdb.erl | 2 +- src/leveled_inker.erl | 2 +- src/leveled_log.erl | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index cdc39ff..af0f102 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -162,7 +162,7 @@ ledger_cache = #ledger_cache{}, is_snapshot :: boolean(), slow_offer = false :: boolean(), - put_timing = {0, {0, 0}, {0, 0}} :: tuple()}). + put_timing :: tuple()}). %%%============================================================================ diff --git a/src/leveled_cdb.erl b/src/leveled_cdb.erl index 66c528c..816e43c 100644 --- a/src/leveled_cdb.erl +++ b/src/leveled_cdb.erl @@ -109,7 +109,7 @@ deferred_delete = false :: boolean(), waste_path :: string(), sync_strategy = none, - put_timing = {0, {0, 0}, {0, 0}} :: tuple()}). + put_timing :: tuple()}). %%%============================================================================ diff --git a/src/leveled_inker.erl b/src/leveled_inker.erl index df3c33a..7fa7a25 100644 --- a/src/leveled_inker.erl +++ b/src/leveled_inker.erl @@ -139,7 +139,7 @@ compaction_pending = false :: boolean(), is_snapshot = false :: boolean(), source_inker :: pid(), - put_timing = {0, {0, 0}, {0, 0}} ::tuple()}). + put_timing :: tuple()}). %%%============================================================================ diff --git a/src/leveled_log.erl b/src/leveled_log.erl index 50163f3..67151cc 100644 --- a/src/leveled_log.erl +++ b/src/leveled_log.erl @@ -328,6 +328,8 @@ log_timer(LogReference, Subs, StartTime) -> %% Make a log of put timings split out by actor - one log for every %% PUT_TIMING_LOGPOINT puts +put_timings(_Actor, undefined, T0, T1) -> + {1, {T0, T1}, {T0, T1}}; put_timings(Actor, {?PUT_TIMING_LOGPOINT, {Total0, Total1}, {Max0, Max1}}, T0, T1) -> LogRef = case Actor of @@ -336,7 +338,7 @@ put_timings(Actor, {?PUT_TIMING_LOGPOINT, {Total0, Total1}, {Max0, Max1}}, T0, T journal -> "CDB17" end, log(LogRef, [?PUT_TIMING_LOGPOINT, Total0, Total1, Max0, Max1]), - {1, {T0, T1}, {T0, T1}}; + put_timings(Actor, undefined, T0, T1); put_timings(_Actor, {N, {Total0, Total1}, {Max0, Max1}}, T0, T1) -> {N + 1, {Total0 + T0, Total1 + T1}, {max(Max0, T0), max(Max1, T1)}}.