diff options
author | Rickard Green <[email protected]> | 2016-02-02 16:21:46 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-02-02 16:21:46 +0100 |
commit | f45b817d0da8f9f61d2241d4f0eb06e47a6be86a (patch) | |
tree | 55648184781e4aecb43f7489b7bc7f82c55c1d2c /erts/doc/src/erl_driver.xml | |
parent | 1a1eaec544987f439061622f0177e424dfd6306a (diff) | |
parent | 876af25b600bf698cac95cd1902fa16aeecc0c7e (diff) | |
download | otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.tar.gz otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.tar.bz2 otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.zip |
Merge branch 'maint'
* maint:
Use nano second time unit in tracing
Diffstat (limited to 'erts/doc/src/erl_driver.xml')
-rw-r--r-- | erts/doc/src/erl_driver.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml index aa8f3baee4..241d4131d5 100644 --- a/erts/doc/src/erl_driver.xml +++ b/erts/doc/src/erl_driver.xml @@ -1052,8 +1052,9 @@ typedef struct ErlIOVec { <desc> <marker id="driver_get_now"></marker> <warning><p><em>This function is deprecated! Do not use it!</em> - Use the documented - <seealso marker="#time_measurement">time measurement functionality</seealso> + Use <seealso marker="#erl_drv_monotonic_time"><c>erl_drv_monotonic_time()</c></seealso> + (perhaps in combination with + <seealso marker="#erl_drv_time_offset"><c>erl_drv_time_offset()</c></seealso>) instead.</p></warning> <p>This function reads a timestamp into the memory pointed to by the parameter <c>now</c>. See the description of <seealso marker="#ErlDrvNowData">ErlDrvNowData</seealso> for |