aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-07-14 16:19:10 +0200
committerLukas Larsson <[email protected]>2016-07-14 16:19:10 +0200
commit0737ad60e3ab97aa481d63c17eebafe1f2bddd55 (patch)
treef148fac63eb7ddbf69c436bfbb395c1df345329d /erts/doc
parentf7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3 (diff)
parent571776ede924840f2a70681764031ca3372dd919 (diff)
downloadotp-0737ad60e3ab97aa481d63c17eebafe1f2bddd55.tar.gz
otp-0737ad60e3ab97aa481d63c17eebafe1f2bddd55.tar.bz2
otp-0737ad60e3ab97aa481d63c17eebafe1f2bddd55.zip
Merge branch 'lukas/erts/dirty_msacc_cleanup/OTP-13744' into maint
* lukas/erts/dirty_msacc_cleanup/OTP-13744: erts: Update msacc docs with dirty scheduler info erts: Cleanup a bunch of un-neccesary #ifndefs erts: Fix some msacc inline directives erts: Add extra bif msacc states erts: Add erts_map_from_ks_and_vs erts: Fix msacc for dirty scheduler and heap_limit
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index e402ce448f..2b7a3b85e5 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6145,6 +6145,10 @@ lists:map(
<taglist>
<tag><c>scheduler</c></tag>
<item>The main execution threads that do most of the work.</item>
+ <tag><c>dirty_cpu_scheduler</c></tag>
+ <item>The threads for long running cpu intensive work.</item>
+ <tag><c>dirty_io_scheduler</c></tag>
+ <item>The threads for long running I/O work.</item>
<tag><c>async</c></tag>
<item>Async threads are used by various linked-in drivers (mainly the
file drivers) do offload non-CPU intensive work.</item>