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 /lib/kernel/doc/src/seq_trace.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 'lib/kernel/doc/src/seq_trace.xml')
| -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 |