Merge branch 'rickard/monotonic-time-improvements/OTP-13222' into maint

* rickard/monotonic-time-improvements/OTP-13222:
  Introduce time management in native APIs
  Introduce time warp safe replacement for safe_fixed option
  Introduce time warp safe trace timestamp formats

2 files changed, 62 insertions, 10 deletions

diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index a0d3f95b6a..48400733d1 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -399,15 +399,40 @@
               kept in RAM.</p>
           </item>
           <item>
-            <p><c>{safe_fixed,</c> SafeFixed<c>}</c>. If the table
-              is fixed, SafeFixed is a tuple <c>{FixedAtTime, [{Pid,RefCount}]}</c>. <c>FixedAtTime</c> is the time when
+            <p><c>{safe_fixed_monotonic_time, SafeFixed}</c>. If the table
+              is fixed, <c>SafeFixed</c> is a tuple <c>{FixedAtTime, [{Pid,RefCount}]}</c>.
+	      <c>FixedAtTime</c> is the time when
               the table was first fixed, and <c>Pid</c> is the pid of
               the process that fixes the table <c>RefCount</c> times.
               There may be any number of processes in the list. If the
               table is not fixed, SafeFixed is the atom <c>false</c>.</p>
+	      <p><c>FixedAtTime</c> will correspond to the result
+	      returned by
+	      <seealso marker="erts:erlang#monotonic_time/0">erlang:monotonic_time/0</seealso>
+	      at the time of fixation. The usage of <c>safe_fixed_monotonic_time</c> is
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>.</p>
           </item>
           <item>
-            <p><c>{version, integer()</c>, the version of the format of
+            <p>
+	      <c>{safe_fixed, SafeFixed}</c>. The same as
+	      <c>{safe_fixed_monotonic_time, SafeFixed}</c> with the exception
+	      of the format and value of <c>FixedAtTime</c>.
+	    </p>
+	    <p>
+	      <c>FixedAtTime</c> will correspond to the result returned by
+	      <seealso marker="erts:erlang#timestamp/0">erlang:timestamp/0</seealso>
+	      at the time of fixation. Note that when the system is using
+	      single or multi
+	      <seealso marker="erts:time_correction#Time_Warp_Modes">time warp
+	      modes</seealso> this might produce strange results. This
+	      since the usage of <c>safe_fixed</c> is not
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>. Time warp safe code need to use
+	      <c>safe_fixed_monotonic_time</c> instead.</p>
+          </item>
+          <item>
+            <p><c>{version, integer()}</c>, the version of the format of
               the table.</p>
           </item>
         </list>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 7b01109ff8..447fe51130 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -488,14 +488,39 @@ Error: fun containing local Erlang function calls
           <item><c>Item=fixed, Value=boolean()</c>          <br></br>
 
            Indicates if the table is fixed by any process or not.</item>
-          <item>
-            <p><c>Item=safe_fixed, Value={FirstFixed,Info}|false</c>              <br></br>
+          <item><marker id="info_2_safe_fixed_monotonic_time"/>
+            <p><c>Item=safe_fixed|safe_fixed_monotonic_time, Value={FixationTime,Info}|false</c>              <br></br>
 </p>
-            <p>If the table has been fixed using <c>safe_fixtable/2</c>,
-              the call returns a tuple where <c>FirstFixed</c> is the
+            <p>If the table has been fixed using
+	    <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>,
+              the call returns a tuple where <c>FixationTime</c> is the
               time when the table was first fixed by a process, which
               may or may not be one of the processes it is fixed by
               right now.</p>
+	    <p>The format and value of <c>FixationTime</c> depends on
+	    <c>Item</c>:</p>
+	    <taglist>
+	      <tag><c>safe_fixed</c></tag>
+	      <item><p><c>FixationTime</c> will correspond to the result
+	      returned by
+	      <seealso marker="erts:erlang#timestamp/0">erlang:timestamp/0</seealso>
+	      at the time of fixation. Note that when the system is using
+	      single or multi
+	      <seealso marker="erts:time_correction#Time_Warp_Modes">time warp
+	      modes</seealso> this might produce strange results. This
+	      since the usage of <c>safe_fixed</c> is not
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>. Time warp safe code need to use
+	      <c>safe_fixed_monotonic_time</c> instead.</p></item>
+
+	      <tag><c>safe_fixed_monotonic_time</c></tag>
+	      <item><p><c>FixationTime</c> will correspond to the result
+	      returned by
+	      <seealso marker="erts:erlang#monotonic_time/0">erlang:monotonic_time/0</seealso>
+	      at the time of fixation. The usage of <c>safe_fixed_monotonic_time</c> is
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>.</p></item>
+	    </taglist>
             <p><c>Info</c> is a possibly empty lists of tuples
               <c>{Pid,RefCount}</c>, one tuple for every process the
               table is fixed by right now. <c>RefCount</c> is the value
@@ -1135,9 +1160,11 @@ clean_all_with_value(Tab,X,Key) ->
           table but never releases it, the memory used by the deleted
           objects will never be freed. The performance of operations on
           the table will also degrade significantly.</p>
-        <p>Use <c>info/2</c> to retrieve information about which
-          processes have fixed which tables. A system with a lot of
-          processes fixing tables may need a monitor which sends alarms
+        <p>Use
+	<seealso marker="#info_2_safe_fixed_monotonic_time"><c>info(Tab,
+	safe_fixed_monotonic_time)</c></seealso> to retrieve information
+	about which processes have fixed which tables. A system with a lot
+	of processes fixing tables may need a monitor which sends alarms
           when tables have been fixed for too long.</p>
         <p>Note that for tables of the <c>ordered_set</c> type,
           <c>safe_fixtable/2</c> is not necessary as calls to