aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_bif_info.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-04-26 15:19:56 +0200
committerLukas Larsson <[email protected]>2016-04-26 15:36:41 +0200
commitd0bca6c9aceb6b5be35342387d6bbbf0f3c5244c (patch)
treeb0885f5d37d58bf59fb15384a10b39d51b72cd5b /erts/emulator/beam/erl_bif_info.c
parent6aae129123c4ce8988cc67b3545db9d1ec51324b (diff)
downloadotp-d0bca6c9aceb6b5be35342387d6bbbf0f3c5244c.tar.gz
otp-d0bca6c9aceb6b5be35342387d6bbbf0f3c5244c.tar.bz2
otp-d0bca6c9aceb6b5be35342387d6bbbf0f3c5244c.zip
erts: Fix total_heap_size calculation for on_heap
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
-rw-r--r--erts/emulator/beam/erl_bif_info.c7
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);