diff options
| author | Rickard Green <[email protected]> | 2016-02-02 16:21:15 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-02 16:21:15 +0100 |
| commit | 876af25b600bf698cac95cd1902fa16aeecc0c7e (patch) | |
| tree | 1692da4f540f75506f88fe06715c1cfe7cafdc4f /lib/kernel/doc | |
| parent | 61ef7511c5ffae0b061d7cc45e9d564b02b891db (diff) | |
| parent | 18f0707c218ebdeb6024ecffd7704d3582e0b91c (diff) | |
| download | otp-876af25b600bf698cac95cd1902fa16aeecc0c7e.tar.gz otp-876af25b600bf698cac95cd1902fa16aeecc0c7e.tar.bz2 otp-876af25b600bf698cac95cd1902fa16aeecc0c7e.zip | |
Merge branch 'rickard/monotonic-time-improvements/OTP-13222' into maint
* rickard/monotonic-time-improvements/OTP-13222:
Use nano second time unit in tracing
Diffstat (limited to 'lib/kernel/doc')
| -rw-r--r-- | lib/kernel/doc/src/seq_trace.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml index 9f191d488d..f4fcd222ec 100644 --- a/lib/kernel/doc/src/seq_trace.xml +++ b/lib/kernel/doc/src/seq_trace.xml @@ -136,7 +136,7 @@ seq_trace:set_token(OldToken), % activate the trace token again <seealso marker="erts:time_correction#Erlang_Monotonic_Time">Erlang monotonic time</seealso> and a monotonically increasing integer. The time-stamp 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>set_token(monotonic_timestamp, <anno>Bool</anno>)</c></tag> @@ -147,7 +147,8 @@ seq_trace:set_token(OldToken), % activate the trace token again will use <seealso marker="erts:time_correction#Erlang_Monotonic_Time">Erlang monotonic time</seealso>. The time-stamp 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> <p>If multiple timestamp flags are passed, <c>timestamp</c> has precedence over <c>strict_monotonic_timestamp</c> which |