aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorSverker Eriksson <sverker@erlang.org>2014-06-12 17:26:00 +0200
committerSverker Eriksson <sverker@erlang.org>2014-06-12 17:26:00 +0200
commitd284f024154cd8b1f8da219d716ad5aa6e8f539c (patch)
treee0b395ecaa02423087e08edd7c36ce992786aeb0 /erts/doc
parent1f0d7a0e7551fb8ca36996d301a2a4025ebc2419 (diff)
parent02c00c02bedde6bad018eef490527aa513fbd552 (diff)
downloadotp-d284f024154cd8b1f8da219d716ad5aa6e8f539c.tar.gz
otp-d284f024154cd8b1f8da219d716ad5aa6e8f539c.tar.bz2
otp-d284f024154cd8b1f8da219d716ad5aa6e8f539c.zip
Merge branch 'sverk/etp-alloc-stats' into maint
* sverk/etp-alloc-stats: erts: Fix documentation for no of default allocator instances erts: Add etp-alloc-stats and etp-alloc-instances
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erts_alloc.xml14
1 files changed, 4 insertions, 10 deletions
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index c9eca39a99..1ade41f1aa 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -4,7 +4,7 @@
<cref>
<header>
<copyright>
- <year>2002</year><year>2013</year>
+ <year>2002</year><year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -531,15 +531,9 @@
<p>Multiple, thread specific instances of the allocator.
This option will only have any effect on the runtime system
with SMP support. Default behaviour on the runtime system with
- SMP support:</p>
- <taglist>
- <tag><c>ll_alloc</c></tag>
- <item><c>1</c> instance.</item>
- <tag>Other allocators</tag>
- <item><c>NoSchedulers+1</c> instances. Each scheduler will use
- a lock-free instance of its own and other threads will use
- a common instance.</item>
- </taglist>
+ SMP support is <c>NoSchedulers+1</c> instances. Each scheduler will use
+ a lock-free instance of its own and other threads will use
+ a common instance.</p>
<p>It was previously (before ERTS version 5.9) possible to configure
a smaller amount of thread specific instances than schedulers.
This is, however, not possible any more.</p>