diff options
author | Siri Hansen <[email protected]> | 2019-03-07 14:24:40 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2019-03-07 14:24:40 +0100 |
commit | 1d2d6d5dee1cad75930ce0359c500928190ae78f (patch) | |
tree | a92eb96632cb95331f35f4c544d002b2a34d4b67 /lib/kernel/src | |
parent | 6842a1c9af46297021b4c9c37eb8dd2a62eec59c (diff) | |
parent | fcacc60891caa3f9ae9d585c808412c11e6b27f5 (diff) | |
download | otp-1d2d6d5dee1cad75930ce0359c500928190ae78f.tar.gz otp-1d2d6d5dee1cad75930ce0359c500928190ae78f.tar.bz2 otp-1d2d6d5dee1cad75930ce0359c500928190ae78f.zip |
Merge branch 'siri/logger/bench' into maint
* siri/logger/bench:
[logger] Add benchmark of big log events with chars_limit and max_size
[logger] Add max memory usage to statistics in logger_olp
Skip logger benchmarks in normal kernel test
[logger] Add benchmark of events per millisecond for handlers
Diffstat (limited to 'lib/kernel/src')
-rw-r--r-- | lib/kernel/src/logger_olp.erl | 5 | ||||
-rw-r--r-- | lib/kernel/src/logger_olp.hrl | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/kernel/src/logger_olp.erl b/lib/kernel/src/logger_olp.erl index 009280a9c9..8365383fe2 100644 --- a/lib/kernel/src/logger_olp.erl +++ b/lib/kernel/src/logger_olp.erl @@ -515,10 +515,11 @@ check_load(State = #{id:=_Name, mode_ref := ModeRef, mode := Mode, end, State1 = ?update_other(drops,DROPS,_NewDrops,State), State2 = ?update_max_qlen(QLen,State1), - State3 = maybe_notify_mode_change(Mode1,State2), + State3 = ?update_max_mem(Mem,State2), + State4 = maybe_notify_mode_change(Mode1,State3), {Mode1, QLen, Mem, ?update_other(flushes,FLUSHES,_NewFlushes, - State3#{last_qlen => QLen})}. + State4#{last_qlen => QLen})}. limit_burst(#{burst_limit_enable := false}=State) -> {true,State}; diff --git a/lib/kernel/src/logger_olp.hrl b/lib/kernel/src/logger_olp.hrl index 9b4f5ebf27..d68b5c048d 100644 --- a/lib/kernel/src/logger_olp.hrl +++ b/lib/kernel/src/logger_olp.hrl @@ -114,12 +114,16 @@ flushes => 0, flushed => 0, drops => 0, burst_drops => 0, casts => 0, calls => 0, writes => 0, max_qlen => 0, max_time => 0, - freq => {TIME,0,0}} end). + max_mem => 0, freq => {TIME,0,0}} end). -define(update_max_qlen(QLEN, STATE), begin #{max_qlen := QLEN0} = STATE, STATE#{max_qlen => ?max(QLEN0,QLEN)} end). + -define(update_max_mem(MEM, STATE), + begin #{max_mem := MEM0} = STATE, + STATE#{max_mem => ?max(MEM0,MEM)} end). + -define(update_calls_or_casts(CALL_OR_CAST, INC, STATE), case CALL_OR_CAST of cast -> @@ -154,6 +158,7 @@ -else. % DEFAULT! -define(merge_with_stats(STATE), STATE). -define(update_max_qlen(_QLEN, STATE), STATE). + -define(update_max_mem(_MEM, STATE), STATE). -define(update_calls_or_casts(_CALL_OR_CAST, _INC, STATE), STATE). -define(update_max_time(_TIME, STATE), STATE). -define(update_other(_OTHER, _VAR, _INCVAL, STATE), STATE). |