From 18f0707c218ebdeb6024ecffd7704d3582e0b91c Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 2 Feb 2016 16:20:19 +0100
Subject: Use nano second time unit in tracing

---
 erts/doc/src/erl_driver.xml | 5 +++--
 erts/doc/src/erlang.xml     | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index e338e95938..34dc8af238 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
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 79d3f66ea8..c9eb838230 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -7744,7 +7744,8 @@ ok
             <p>Timestamps in profile messages will use
 	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
 	    monotonic time</seealso>. The time-stamp (Ts) has the same
-	    format and value as produced by <c>erlang:monotonic_time()</c>.</p>
+	    format and value as produced by
+	    <c>erlang:monotonic_time(nano_seconds)</c>.</p>
           </item>
           <tag><c>runnable_procs</c></tag>
           <item>
@@ -7772,7 +7773,7 @@ ok
 	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
 	    monotonic time</seealso> and a monotonically increasing
 	    integer. The time-stamp (Ts) has the same format and value
-	    as produced by <c>{erlang:monotonic_time(),
+	    as produced by <c>{erlang:monotonic_time(nano_seconds),
 	    erlang:unique_integer([monotonic])}</c>.</p>
           </item>
           <tag><c>timestamp</c></tag>
@@ -8161,7 +8162,7 @@ timestamp() ->
 	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
 	    monotonic time</seealso> time-stamp in all trace messages. The
             time-stamp (Ts) has the same format and value as produced by
-            <c>erlang:monotonic_time()</c>. This flag overrides
+            <c>erlang:monotonic_time(nano_seconds)</c>. This flag overrides
 	    the <c>cpu_timestamp</c> flag.</p>
           </item>
           <tag><c>strict_monotonic_timestamp</c></tag>
@@ -8171,7 +8172,7 @@ timestamp() ->
 	    monotonic time</seealso> and a monotonically increasing
 	    integer in all trace messages. The time-stamp (Ts) has the
 	    same format and value as produced by
-            <c>{erlang:monotonic_time(),
+            <c>{erlang:monotonic_time(nano_seconds),
 	    erlang:unique_integer([monotonic])}</c>. This flag overrides
 	    the <c>cpu_timestamp</c> flag.</p>
           </item>
-- 
cgit v1.2.3