diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-26 17:37:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-26 17:37:35 +0200 |
| commit | 42b9881d075344344a8c78026e282b40fa707a0c (patch) | |
| tree | d9755627cee82a99eff6755c8f092ed45dd7a71e /lib/percept | |
| parent | 6408400fc1ca9609169f6a0450f1c4671aced91c (diff) | |
| parent | 1302b09c4aa0f944bdc0e3beeebb2cf84cc06c89 (diff) | |
| download | otp-42b9881d075344344a8c78026e282b40fa707a0c.tar.gz otp-42b9881d075344344a8c78026e282b40fa707a0c.tar.bz2 otp-42b9881d075344344a8c78026e282b40fa707a0c.zip | |
Merge branch 'master' into sverker/hipe-fun-purge
Diffstat (limited to 'lib/percept')
| -rw-r--r-- | lib/percept/src/percept.app.src | 2 | ||||
| -rw-r--r-- | lib/percept/src/percept.erl | 4 | ||||
| -rw-r--r-- | lib/percept/test/percept_SUITE.erl | 8 |
3 files changed, 7 insertions, 7 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}))]), diff --git a/lib/percept/test/percept_SUITE.erl b/lib/percept/test/percept_SUITE.erl index fbc77302ae..2be8b70e0d 100644 --- a/lib/percept/test/percept_SUITE.erl +++ b/lib/percept/test/percept_SUITE.erl @@ -79,9 +79,9 @@ analyze(Config) when is_list(Config) -> Begin = processes(), Path = proplists:get_value(data_dir, Config), File = filename:join([Path,"profile_test.dat"]), - T0 = erlang:monotonic_time(milli_seconds), + T0 = erlang:monotonic_time(millisecond), ok = percept:analyze(File), - T1 = erlang:monotonic_time(milli_seconds), + T1 = erlang:monotonic_time(millisecond), io:format("percept:analyze/1 took ~w ms.~n", [T1 - T0]), {stopped, _} = percept_db:stop(), print_remainers(remainers(Begin, processes())), @@ -92,9 +92,9 @@ analyze_dist(Config) when is_list(Config) -> Begin = processes(), Path = proplists:get_value(data_dir, Config), File = filename:join([Path,"ipc-dist.dat"]), - T0 = erlang:monotonic_time(milli_seconds), + T0 = erlang:monotonic_time(millisecond), ok = percept:analyze(File), - T1 = erlang:monotonic_time(milli_seconds), + T1 = erlang:monotonic_time(millisecond), io:format("percept:analyze/1 took ~w ms.~n", [T1 - T0]), {stopped, _} = percept_db:stop(), print_remainers(remainers(Begin, processes())), |