diff options
| author | Rickard Green <[email protected]> | 2016-01-05 16:55:04 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-01-20 11:10:37 +0100 |
| commit | 858c6f7fa44f7b2dc363b359198d6522dd60e914 (patch) | |
| tree | fdad35b9a7a9904d7dc4586aced86c79fb46a78c /erts/preloaded | |
| parent | df18cd270ad682cedc8c21990641b0bdb8788092 (diff) | |
| download | otp-858c6f7fa44f7b2dc363b359198d6522dd60e914.tar.gz otp-858c6f7fa44f7b2dc363b359198d6522dd60e914.tar.bz2 otp-858c6f7fa44f7b2dc363b359198d6522dd60e914.zip | |
Introduce time warp safe trace timestamp formats
New timestamp options for trace, sequential trace, and
system profile:
- monotonic_timestamp
- strict_monotonic_timestamp
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 102000 -> 102116 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 13 |
2 files changed, 12 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 58516c0ff3..36862802ca 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 5fc6d14938..063b9a1f26 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -185,6 +185,8 @@ 'receive' | 'print' | 'timestamp' | + 'monotonic_timestamp' | + 'strict_monotonic_timestamp' | 'label' | 'serial'. @@ -198,7 +200,10 @@ 'exclusive' | 'runnable_ports' | 'runnable_procs' | - 'scheduler'. + 'scheduler' | + 'timestamp' | + 'monotonic_timestamp' | + 'strict_monotonic_timestamp'. -type system_monitor_option() :: 'busy_port' | @@ -230,6 +235,8 @@ garbage_collection | timestamp | cpu_timestamp | + monotonic_timestamp | + strict_monotonic_timestamp | arity | set_on_spawn | set_on_first_spawn | @@ -258,6 +265,8 @@ running | garbage_collection | timestamp | + monotonic_timestamp | + strict_monotonic_timestamp | arity. -type trace_info_return() :: @@ -2178,6 +2187,8 @@ send(_Dest,_Msg,_Options) -> ('receive') -> {'receive', boolean()}; (print) -> {print, boolean()}; (timestamp) -> {timestamp, boolean()}; + (monotonic_timestamp) -> {timestamp, boolean()}; + (strict_monotonic_timestamp) -> {strict_monotonic_timestamp, boolean()}; (label) -> [] | {label, non_neg_integer()}; (serial) -> [] | {serial, {non_neg_integer(), non_neg_integer()}}. seq_trace_info(_What) -> |