aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-12-02 19:29:03 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-12-02 19:29:03 +0100
commit07eda121aa538ea007c6354d8f586e65a0856926 (patch)
tree1d5e303142647c61c847e312735713198a037970
parent5031834c7135850290d12ba02fd9e49c9ebf579d (diff)
parentbc08768e5bad4baa2eaec4c6798ead9ded0a8889 (diff)
downloadotp-07eda121aa538ea007c6354d8f586e65a0856926.tar.gz
otp-07eda121aa538ea007c6354d8f586e65a0856926.tar.bz2
otp-07eda121aa538ea007c6354d8f586e65a0856926.zip
Merge branch 'egil/fix-seq_trace'
* egil/fix-seq_trace: Fix seq_trace token copy size Fix seq_trace refactoring bug
-rw-r--r--erts/emulator/beam/erl_process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index d0ce9b7249..a714068314 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -11542,7 +11542,7 @@ send_exit_message(Process *to, ErtsProcLocks *to_locksp,
#ifdef SHCOPY_SEND
INITIALIZE_SHCOPY(info);
term_size = copy_shared_calculate(exit_term, &info);
- mp = erts_alloc_message_heap(to, to_locksp, term_size, &hp, &ohp);
+ mp = erts_alloc_message_heap(to, to_locksp, term_size+sz_token, &hp, &ohp);
mess = copy_shared_perform(exit_term, term_size, &info, &hp, ohp);
DESTROY_SHCOPY(info);
#else
@@ -11661,7 +11661,7 @@ send_exit_signal(Process *c_p, /* current process if and only
if ((state & ERTS_PSFLG_TRAP_EXIT)
&& (reason != am_kill || (flags & ERTS_XSIG_FLG_IGN_KILL))) {
- if (have_seqtrace(token))
+ if (have_seqtrace(token) && token_update)
seq_trace_update_send(token_update);
if (is_value(exit_tuple))
send_exit_message(rp, rp_locks, exit_tuple, exit_tuple_sz, token);