aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-03 09:33:02 +0200
committerGitHub <[email protected]>2018-07-03 09:33:02 +0200
commit6cfa8af60a9c6fe9043e4992434d40d4a34019e3 (patch)
tree822993e0a4fb987014238369db045bf53eaafba3 /erts/doc
parentbc22321f10c1ad71fb7e28275a8e6ed26a34d4ab (diff)
parent29ce7ab0e4403fa688d1e5e5e2170e88d7e8f299 (diff)
downloadotp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.tar.gz
otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.tar.bz2
otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.zip
Merge pull request #1854 from jhogberg/john/erts/cross-type-carrier-migration/OTP-15063
Allow carrier migration between different allocator types
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erts_alloc.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index a094217959..962bc9a244 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -487,11 +487,10 @@
utilization value used. Once a carrier is abandoned, no new
allocations are made in it. When an allocator instance gets an
increased multiblock carrier need, it first tries to fetch an
- abandoned carrier from an allocator instance of the same
- allocator type. If no abandoned carrier can be fetched, it
- creates a new empty carrier. When an abandoned carrier has been
- fetched, it will function as an ordinary carrier. This feature has
- special requirements on the
+ abandoned carrier from another allocator instance. If no abandoned
+ carrier can be fetched, it creates a new empty carrier. When an
+ abandoned carrier has been fetched, it will function as an ordinary
+ carrier. This feature has special requirements on the
<seealso marker="#M_as">allocation strategy</seealso> used. Only
the strategies <c>aoff</c>, <c>aoffcbf</c>, <c>aoffcaobf</c>,
<c>ageffcaoff</c>m, <c>ageffcbf</c> and <c>ageffcaobf</c>
@@ -584,7 +583,7 @@
carriers are decided in section
<seealso marker="#mseg_mbc_sizes">
The alloc_util Framework</seealso>. On
- 32-bit Unix style OS this limit cannot be set &gt; 128 MB.</p>
+ 32-bit Unix style OS this limit cannot be set &gt; 64 MB.</p>
</item>
<tag><marker id="M_mbcgs"/><c><![CDATA[+M<S>mbcgs <ratio>]]></c></tag>
<item>