diff options
author | Sverker Eriksson <[email protected]> | 2016-05-09 18:16:54 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-05-09 18:16:54 +0200 |
commit | 5ca152a5ccca92e354188f7b696ca5b9f6b92806 (patch) | |
tree | f0b2794d847b117266d68851ce28435626ca7829 /erts/doc | |
parent | d7e7284c4f94a6cc205519692cc48835c45d342a (diff) | |
parent | dd5087bf582bba0879fa352bdc0ddcbf06d943d2 (diff) | |
download | otp-5ca152a5ccca92e354188f7b696ca5b9f6b92806.tar.gz otp-5ca152a5ccca92e354188f7b696ca5b9f6b92806.tar.bz2 otp-5ca152a5ccca92e354188f7b696ca5b9f6b92806.zip |
Merge branch 'sverker/system_info-erts_mmap/OTP-13560'
Diffstat (limited to 'erts/doc')
-rw-r--r-- | erts/doc/src/erlang.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index bdaa6caa15..bf30cc7928 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -6841,11 +6841,7 @@ ok As from <c>ERTS</c> 5.6.1, the return value is a list of <c>{instance, InstanceNo, InstanceInfo}</c> tuples, where <c>InstanceInfo</c> contains information about - a specific instance of the allocator. As from - <c>ERTS</c> 5.10.4, the returned list when calling - <c>erlang:system_info({allocator, mseg_alloc})</c> also - includes an <c>{erts_mmap, _}</c> tuple as one element - in the list. If <c><anno>Alloc</anno></c> is not a + a specific instance of the allocator. If <c><anno>Alloc</anno></c> is not a recognized allocator, <c>undefined</c> is returned. If <c><anno>Alloc</anno></c> is disabled, <c>false</c> is returned.</p> @@ -6857,7 +6853,13 @@ ok briefly documented.</p> <p>The recognized allocators are listed in <seealso marker="erts:erts_alloc">erts_alloc(3)</seealso>. - After reading the <c>erts_alloc(3)</c> documentation, + Information about super carriers can be obtained from + <c>ERTS</c> 8.0 with <c>{allocator, erts_mmap}</c> or from + <c>ERTS</c> 5.10.4, the returned list when calling with + <c>{allocator, mseg_alloc}</c> also includes an + <c>{erts_mmap, _}</c> tuple as one element in the list.</p> + + <p>After reading the <c>erts_alloc(3)</c> documentation, the returned information more or less speaks for itself, but it can be worth explaining some things. Call counts are presented by two |