aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-10-05 12:00:27 +0200
committerLukas Larsson <[email protected]>2017-10-05 12:00:27 +0200
commit558f152750f87f192deb9492a0c21699eee30020 (patch)
tree2a2431d5013bde540eb48721f0501cadf365036b /erts/preloaded
parentf7476ef04d6cad95a54aff3aae734c25a283e3fd (diff)
parent6543f15a3b6d9c1f71ff30ea682d64d1c8c7a7dc (diff)
downloadotp-558f152750f87f192deb9492a0c21699eee30020.tar.gz
otp-558f152750f87f192deb9492a0c21699eee30020.tar.bz2
otp-558f152750f87f192deb9492a0c21699eee30020.zip
Merge branch 'lukas/erts/poll-thread/OTP-14346'
* lukas/erts/poll-thread/OTP-14346: erts: Update +IOt and msacc docs
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin107320 -> 107328 bytes
-rw-r--r--erts/preloaded/src/erlang.erl3
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index e258ff5480..452f3dcc07 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index d43fdc454c..c6c105d36a 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2344,7 +2344,8 @@ spawn_opt(_Tuple) ->
MSAcc_Thread :: #{ type := MSAcc_Thread_Type,
id := MSAcc_Thread_Id,
counters := MSAcc_Counters},
- MSAcc_Thread_Type :: scheduler | async | aux,
+ MSAcc_Thread_Type :: async | aux | dirty_io_scheduler
+ | dirty_cpu_scheduler | poll | scheduler,
MSAcc_Thread_Id :: non_neg_integer(),
MSAcc_Counters :: #{ MSAcc_Thread_State => non_neg_integer() },
MSAcc_Thread_State :: alloc | aux | bif | busy_wait | check_io |