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/erlang.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/erlang.xml')
| -rw-r--r-- | erts/doc/src/erlang.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index d0d35ea25f..d3aad94660 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -7859,7 +7859,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> @@ -7887,7 +7888,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> @@ -8276,7 +8277,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> @@ -8286,7 +8287,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> |