diff options
| author | Lukas Larsson <[email protected]> | 2016-03-29 14:57:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-03-29 14:57:29 +0200 |
| commit | 3f190b62031783ad4fc9bb1fb91703a1b1b40ad7 (patch) | |
| tree | 7b1a00e113b4350c373bc7f4f58daaf5032c947a /erts/emulator/beam/erl_trace.c | |
| parent | 96a0a707c6a7ba7ce9d6668705ca10c66666a8c3 (diff) | |
| parent | ed81bb9ed8114d2059783e2c2fdae526d3a36e1e (diff) | |
| download | otp-3f190b62031783ad4fc9bb1fb91703a1b1b40ad7.tar.gz otp-3f190b62031783ad4fc9bb1fb91703a1b1b40ad7.tar.bz2 otp-3f190b62031783ad4fc9bb1fb91703a1b1b40ad7.zip | |
Merge branch 'lukas/erts/enif_trace_functions/OTP-13442'
* lukas/erts/enif_trace_functions/OTP-13442:
erts: Fix bug in enif_send
erts: Fix windows nif port tests
erts: Fix bug in enif_term_to_binary
erts: Remove printout when dec_term fails in DEBUG
erts: Polish erl_nif docs
erts: Improve enif_binary_to_term
erts: Add enif_port_command
erts: Add enif_term_to_binary and enif_binary_to_term
erts: Add enif_is_process/port_alive
erts: Add enif_cpu/now_time and enif_make_unique_integer
Diffstat (limited to 'erts/emulator/beam/erl_trace.c')
| -rw-r--r-- | erts/emulator/beam/erl_trace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index 41876b8c62..9033c1b75c 100644 --- a/erts/emulator/beam/erl_trace.c +++ b/erts/emulator/beam/erl_trace.c @@ -176,7 +176,7 @@ take_timestamp(ErtsTraceTimeStamp *tsp, int ts_type) hsz += 3; /* 2-tuple */ raw_unique = erts_raw_get_unique_monotonic_integer(); tsp->u.monotonic.raw_unique = raw_unique; - hsz += erts_raw_unique_monotonic_integer_heap_size(raw_unique); + hsz += erts_raw_unique_monotonic_integer_heap_size(raw_unique, 0); } return hsz; } @@ -216,8 +216,7 @@ write_timestamp(ErtsTraceTimeStamp *tsp, Eterm **hpp) return emtime; raw = tsp->u.monotonic.raw_unique; - unique = erts_raw_make_unique_monotonic_integer_value(hpp, - raw); + unique = erts_raw_make_unique_monotonic_integer_value(hpp, raw, 0); res = TUPLE2(*hpp, emtime, unique); *hpp += 3; return res; |