diff options
| author | Lukas Larsson <[email protected]> | 2016-05-03 10:18:59 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-03 10:18:59 +0200 |
| commit | e36b604cb3fe58fcd7a8916d8498b5f2182ddcff (patch) | |
| tree | 27949ccebd800e7b0ee08b2209b1cbe8b90ceb77 /erts/emulator/beam/erl_bif_info.c | |
| parent | 0dcc4dad547fb7774f9c3b964fadec14fda15243 (diff) | |
| parent | e1c70e582bc9e9eddd56d5483e59edc6eb75c3a6 (diff) | |
| download | otp-e36b604cb3fe58fcd7a8916d8498b5f2182ddcff.tar.gz otp-e36b604cb3fe58fcd7a8916d8498b5f2182ddcff.tar.bz2 otp-e36b604cb3fe58fcd7a8916d8498b5f2182ddcff.zip | |
Merge branch 'lukas/erts/rename_xmqd_to_hmqd/OTP-13366'
* lukas/erts/rename_xmqd_to_hmqd/OTP-13366:
erts: Rename erl flag +xmqd to +hmqd in erlexec
Fix proc_lib message_queue_data spec
erts: Fix total_heap_size calculation for on_heap
erts: Rename erl flag +xmqd to +hmqd
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index c9741b361f..99fe847ba2 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -1359,9 +1359,10 @@ process_info_aux(Process *BIF_P, total_heap_size += rp->mbuf_sz; - for (mp = rp->msg.first; mp; mp = mp->next) - if (mp->data.attached) - total_heap_size += erts_msg_attached_data_size(mp); + if (rp->flags & F_ON_HEAP_MSGQ) + for (mp = rp->msg.first; mp; mp = mp->next) + if (mp->data.attached) + total_heap_size += erts_msg_attached_data_size(mp); (void) erts_bld_uint(NULL, &hsz, total_heap_size); hp = HAlloc(BIF_P, hsz); |