diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
| commit | 502ed5fd6bd36328d6be63c68ee2a56738ced058 (patch) | |
| tree | 80cfb83dd63ffa876541740cc067ea05bb39118d /lib/percept/src | |
| parent | cf102c1b1225450e7918a6119b7d949eb7e575c4 (diff) | |
| parent | 0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (diff) | |
| download | otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.gz otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.bz2 otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.zip | |
Merge branch 'master' into sverker/master/load_nif-print-init-error
Diffstat (limited to 'lib/percept/src')
| -rw-r--r-- | lib/percept/src/percept.app.src | 2 | ||||
| -rw-r--r-- | lib/percept/src/percept.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/percept/src/percept.app.src b/lib/percept/src/percept.app.src index 1749730f97..ab0d9a4d90 100644 --- a/lib/percept/src/percept.app.src +++ b/lib/percept/src/percept.app.src @@ -38,7 +38,7 @@ {applications, [kernel,stdlib]}, {env,[]}, {runtime_dependencies, ["stdlib-2.0","runtime_tools-1.8.14","kernel-3.0", - "inets-5.10","erts-6.0"]} + "inets-5.10","erts-9.0"]} ]}. diff --git a/lib/percept/src/percept.erl b/lib/percept/src/percept.erl index 046e0b7518..25c6ae19b1 100644 --- a/lib/percept/src/percept.erl +++ b/lib/percept/src/percept.erl @@ -217,7 +217,7 @@ stop_webserver(Port) -> parse_and_insert(Filename, DB) -> io:format("Parsing: ~p ~n", [Filename]), - T0 = erlang:monotonic_time(milli_seconds), + T0 = erlang:monotonic_time(millisecond), Pid = dbg:trace_client(file, Filename, mk_trace_parser(self())), Ref = erlang:monitor(process, Pid), parse_and_insert_loop(Filename, Pid, Ref, DB, T0). @@ -230,7 +230,7 @@ parse_and_insert_loop(Filename, Pid, Ref, DB, T0) -> {parse_complete, {Pid, Count}} -> receive {'DOWN', Ref, process, Pid, normal} -> ok after 0 -> ok end, DB ! {action, consolidate}, - T1 = erlang:monotonic_time(milli_seconds), + T1 = erlang:monotonic_time(millisecond), io:format("Parsed ~w entries in ~w ms.~n", [Count, T1 - T0]), io:format(" ~p created processes.~n", [length(percept_db:select({information, procs}))]), io:format(" ~p opened ports.~n", [length(percept_db:select({information, ports}))]), |