diff options
| author | Rickard Green <[email protected]> | 2014-12-17 22:18:27 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-20 15:28:53 +0100 |
| commit | fbaa0becc787e73fa539e0d497b0d74be27c9534 (patch) | |
| tree | c89e004b5e33d51ca07635678415c8dc4e8f2f23 /lib/reltool/src | |
| parent | 1d9350693fe2c4d1d6b2baa504aacd070e023a1a (diff) | |
| download | otp-fbaa0becc787e73fa539e0d497b0d74be27c9534.tar.gz otp-fbaa0becc787e73fa539e0d497b0d74be27c9534.tar.bz2 otp-fbaa0becc787e73fa539e0d497b0d74be27c9534.zip | |
Replace usage of erlang:now() with usage of new API
Diffstat (limited to 'lib/reltool/src')
| -rw-r--r-- | lib/reltool/src/reltool.app.src | 2 | ||||
| -rw-r--r-- | lib/reltool/src/reltool_fgraph_win.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/reltool/src/reltool.app.src b/lib/reltool/src/reltool.app.src index 65fcf4aae5..579d2c0d1b 100644 --- a/lib/reltool/src/reltool.app.src +++ b/lib/reltool/src/reltool.app.src @@ -36,5 +36,5 @@ {applications, [stdlib, kernel]}, {env, []}, {runtime_dependencies, ["wx-1.2","tools-2.6.14","stdlib-2.0","sasl-2.4", - "kernel-3.0","erts-6.0"]} + "kernel-3.0","erts-7.0"]} ]}. diff --git a/lib/reltool/src/reltool_fgraph_win.erl b/lib/reltool/src/reltool_fgraph_win.erl index 66bc2b5ab3..d9e6f6d427 100644 --- a/lib/reltool/src/reltool_fgraph_win.erl +++ b/lib/reltool/src/reltool_fgraph_win.erl @@ -252,10 +252,10 @@ ticker_init(Pid) -> ticker_loop(Pid, Time) -> receive after Time -> Pid ! {self(), redraw}, - T0 = now(), + T0 = erlang:monotonic_time(), receive {Pid, ok} -> ok end, - T1 = now(), - D = timer:now_diff(T1, T0)/1000, + T1 = erlang:monotonic_time(), + D = erlang:convert_time_unit(T1-T0, native, milli_seconds), case round(40 - D) of Ms when Ms < 0 -> %io:format("ticker: wait is 0 ms [fg ~7s ms] [fps ~7s]~n", |