diff options
| author | Siri Hansen <[email protected]> | 2016-12-20 09:35:04 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-12-20 09:35:04 +0100 |
| commit | 5ec809d53049d956869f9c17e1eef207c4cc1ed4 (patch) | |
| tree | c5eb92bfb5890277e5bf6d4f2a1d5f800514bf6a /lib/observer/src/etop_txt.erl | |
| parent | 01c893ba18d524cd4868533b79ae2dd8bc395e7e (diff) | |
| parent | 40e5a09362042adfccc5964bde48a2dce27373fd (diff) | |
| download | otp-5ec809d53049d956869f9c17e1eef207c4cc1ed4.tar.gz otp-5ec809d53049d956869f9c17e1eef207c4cc1ed4.tar.bz2 otp-5ec809d53049d956869f9c17e1eef207c4cc1ed4.zip | |
Merge branch 'siri/etop/cpu-per-interval/OTP-14090' into maint
* siri/etop/cpu-per-interval/OTP-14090:
[etop] Show CPU utilization for last interval only
Diffstat (limited to 'lib/observer/src/etop_txt.erl')
| -rw-r--r-- | lib/observer/src/etop_txt.erl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/observer/src/etop_txt.erl b/lib/observer/src/etop_txt.erl index 3b4c176478..6b8f9df24f 100644 --- a/lib/observer/src/etop_txt.erl +++ b/lib/observer/src/etop_txt.erl @@ -22,35 +22,35 @@ %%-compile(export_all). -export([init/1,stop/1]). --export([do_update/3]). +-export([do_update/4]). -include("etop.hrl"). -include("etop_defs.hrl"). --import(etop,[loadinfo/1,meminfo/2]). +-import(etop,[loadinfo/2,meminfo/2]). -define(PROCFORM,"~-15w~-20s~8w~8w~8w~8w ~-20s~n"). stop(Pid) -> Pid ! stop. init(Config) -> - loop(Config). + loop(#etop_info{},Config). -loop(Config) -> - Info = do_update(Config), +loop(Prev,Config) -> + Info = do_update(Prev,Config), receive stop -> stopped; - {dump,Fd} -> do_update(Fd,Info,Config), loop(Config); - {config,_,Config1} -> loop(Config1) - after Config#opts.intv -> loop(Config) + {dump,Fd} -> do_update(Fd,Info,Prev,Config), loop(Info,Config); + {config,_,Config1} -> loop(Info,Config1) + after Config#opts.intv -> loop(Info,Config) end. -do_update(Config) -> +do_update(Prev,Config) -> Info = etop:update(Config), - do_update(standard_io,Info,Config). + do_update(standard_io,Info,Prev,Config). -do_update(Fd,Info,Config) -> - {Cpu,NProcs,RQ,Clock} = loadinfo(Info), +do_update(Fd,Info,Prev,Config) -> + {Cpu,NProcs,RQ,Clock} = loadinfo(Info,Prev), io:nl(Fd), writedoubleline(Fd), case Info#etop_info.memi of |