aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-05-03 10:18:59 +0200
committerLukas Larsson <[email protected]>2016-05-03 10:18:59 +0200
commite36b604cb3fe58fcd7a8916d8498b5f2182ddcff (patch)
tree27949ccebd800e7b0ee08b2209b1cbe8b90ceb77 /lib
parent0dcc4dad547fb7774f9c3b964fadec14fda15243 (diff)
parente1c70e582bc9e9eddd56d5483e59edc6eb75c3a6 (diff)
downloadotp-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 'lib')
-rw-r--r--lib/stdlib/src/proc_lib.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 3f79ed0f87..fdc2ae4070 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -48,7 +48,9 @@
| {'priority', priority_level()}
| {'min_heap_size', non_neg_integer()}
| {'min_bin_vheap_size', non_neg_integer()}
- | {'fullsweep_after', non_neg_integer()}.
+ | {'fullsweep_after', non_neg_integer()}
+ | {'message_queue_data',
+ 'off_heap' | 'on_heap' | 'mixed' }.
-type dict_or_pid() :: pid()
| (ProcInfo :: [_])