aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-12-02 18:39:36 +0100
committerRickard Green <[email protected]>2013-12-02 18:39:36 +0100
commit44aabe5944459d703389ee2877d1d926388d5562 (patch)
treef4eb01710fadbbea27237132942d018bdda4e593
parent471abeb72af964049fcd3ed169d1bca7c5534d4c (diff)
parent754d8ec0eec7a75b95bc970580e8b455095297ba (diff)
downloadotp-44aabe5944459d703389ee2877d1d926388d5562.tar.gz
otp-44aabe5944459d703389ee2877d1d926388d5562.tar.bz2
otp-44aabe5944459d703389ee2877d1d926388d5562.zip
Merge branch 'maint'
* maint: Documentation fix
-rw-r--r--erts/doc/src/erlang.xml6
-rw-r--r--erts/doc/src/erts_alloc.xml7
2 files changed, 10 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index dabfe3f5ad..bff544100f 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5400,7 +5400,11 @@ ok
As of erts version 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.
+ a specific instance of the allocator. As of erts version
+ 5.10.4 the returned list when calling
+ <c>erlang:system_info({allocator, mseg_alloc})</c> also
+ include an <c>{erts_mmap, _}</c> tuple as one element
+ in the list.
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>
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index d69fdae5b3..fffa9f594c 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -332,8 +332,11 @@
Set super carrier size (in MB). The super carrier size defaults to
zero; i.e, the super carrier is by default disabled. The super
carrier is a large continuous area in the virtual address space.
- The system will always try to create new carriers in the super
- carrier.
+ <c>mseg_alloc</c> will always try to create new carriers in the super
+ carrier if it exists. Note that the <c>alloc_util</c> framework may
+ create <c>sys_alloc</c> carriers. For more information on this, see the
+ documentation of the <seealso marker="#MMsco"><c>+MMsco</c></seealso>
+ flag.
<br/><br/>
<em>NOTE</em>: The super carrier cannot be enabled nor
disabled on halfword heap systems. This flag will be