diff options
author | Rickard Green <[email protected]> | 2012-08-03 15:12:02 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2012-08-03 15:12:02 +0200 |
commit | afb19a88ab89ae0b45e28555eee2a03d8215b1b1 (patch) | |
tree | e6e6816f2ae9ab44b2b35243dc347648a4d4028e /erts/etc | |
parent | e76262ea8ac6986a497bb1e7fbf5e75668027473 (diff) | |
parent | 88126e785de24f5f41068c610bc13840dcab4a7d (diff) | |
download | otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.tar.gz otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.tar.bz2 otp-afb19a88ab89ae0b45e28555eee2a03d8215b1b1.zip |
Merge branch 'rickard/tab-unref-thr-prgr/OTP-10167'
* rickard/tab-unref-thr-prgr/OTP-10167:
Use thread progress instead of scheduling misc aux work were possible
Conflicts:
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/etc')
-rw-r--r-- | erts/etc/unix/etp-commands | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/unix/etp-commands b/erts/etc/unix/etp-commands index aed8a6461a..d98505c0ff 100644 --- a/erts/etc/unix/etp-commands +++ b/erts/etc/unix/etp-commands @@ -1400,7 +1400,7 @@ define etp-process-info end printf " Mbuf size: %ld\n", $arg0->mbuf_sz if (etp_smp_compiled) - printf " Msgq len: %ld (inner=%ld, outer=%ld)\n", ($arg0->msg.len + $arg0->msg_inq.len), $arg0->msg.len, $arg0->msg_inq.len + printf " Msgq len: %ld (inner=%ld, outer=%ld)\n", ($arg0->msg.len + $arg0->u.alive.msg_inq.len), $arg0->msg.len, $arg0->u.alive.msg_inq.len else printf " Msgq len: %d\n", $arg0->msg.len end |