diff options
| author | Rickard Green <[email protected]> | 2016-05-27 10:21:30 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-05-27 10:21:30 +0200 |
| commit | a390d27f5c39d5a120db1f3e8e7185f85a05debd (patch) | |
| tree | 3bd2a5e996576f5d07213f298e67b5a947b68ccf /erts/emulator/beam/erl_gc.c | |
| parent | 48d0c9844b1d205683dd3ef2ab6719e3f0f14aba (diff) | |
| parent | 20383144c26512fe33e72f49dff52dc628666923 (diff) | |
| download | otp-a390d27f5c39d5a120db1f3e8e7185f85a05debd.tar.gz otp-a390d27f5c39d5a120db1f3e8e7185f85a05debd.tar.bz2 otp-a390d27f5c39d5a120db1f3e8e7185f85a05debd.zip | |
Merge branch 'rickard/on_heap-fix/OTP-13366'
* rickard/on_heap-fix/OTP-13366:
Improve message allocation in enif_send()
Fix message queue update on replacement and removal of message
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 374da9407c..c7bbbd5ca0 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -2293,18 +2293,13 @@ move_msgq_to_heap(Process *p) free_message_buffer(bp); } else { - ErtsMessage *tmp = erts_alloc_message(0, NULL); - sys_memcpy((void *) tmp->m, (void *) mp->m, - sizeof(Eterm)*ERL_MESSAGE_REF_ARRAY_SZ); - tmp->next = mp->next; - if (p->msg.save == &mp->next) - p->msg.save = &tmp->next; - if (p->msg.last == &mp->next) - p->msg.last = &tmp->next; - *mpp = tmp; + ErtsMessage *new_mp = erts_alloc_message(0, NULL); + sys_memcpy((void *) new_mp->m, (void *) mp->m, + sizeof(Eterm)*ERL_MESSAGE_REF_ARRAY_SZ); + erts_msgq_replace_msg_ref(&p->msg, new_mp, mpp); mp->next = NULL; erts_cleanup_messages(mp); - mp = tmp; + mp = new_mp; } } |