diff options
author | Sverker Eriksson <[email protected]> | 2012-04-27 15:23:10 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2012-04-27 15:23:10 +0200 |
commit | cac5ec5c4452c9f108893f82bbbb0a23119861c7 (patch) | |
tree | 9eee9abe850ff420d0dac0a97aaf6ecabbbea0bd /erts/doc/src/erl.xml | |
parent | 398bb9a9a5b2a56f0333ce81efe00380692ec93a (diff) | |
parent | 3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c (diff) | |
download | otp-cac5ec5c4452c9f108893f82bbbb0a23119861c7.tar.gz otp-cac5ec5c4452c9f108893f82bbbb0a23119861c7.tar.bz2 otp-cac5ec5c4452c9f108893f82bbbb0a23119861c7.zip |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/erl_process.c
Diffstat (limited to 'erts/doc/src/erl.xml')
-rw-r--r-- | erts/doc/src/erl.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 4ef3e089a6..16f5205b29 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -768,6 +768,16 @@ <seealso marker="erlang#system_info_scheduler_bindings">erlang:system_info(scheduler_bindings)</seealso>. </p> </item> + <tag><marker id="+sbwt"><c>+sbwt none|very_short|short|medium|long|very_long</c></marker></tag> + <item> + <p>Set scheduler busy wait threshold. Default is <c>medium</c>. + The threshold determines how long schedulers should busy + wait when running out of work before going to sleep. + </p> + <p><em>NOTE:</em> This flag may be removed or changed at any time + without prior notice. + </p> + </item> <tag><marker id="+scl"><c>+scl true|false</c></marker></tag> <item> <p>Enable or disable scheduler compaction of load. By default @@ -903,6 +913,17 @@ <p>For more information, see <seealso marker="erlang#system_info_cpu_topology">erlang:system_info(cpu_topology)</seealso>.</p> </item> + <tag><marker id="+sws"><c>+sws default|legacy|proposal</c></marker></tag> + <item> + <p>Set scheduler wakeup strategy. Default is <c>legacy</c> (has been + used since OTP-R13B). The <c>proposal</c> strategy is the currently + proposed strategy for OTP-R16. Note that the <c>proposal</c> strategy + might change during OTP-R15. + </p> + <p><em>NOTE:</em> This flag may be removed or changed at any time + without prior notice. + </p> + </item> <tag><marker id="+swt"><c>+swt very_low|low|medium|high|very_high</c></marker></tag> <item> <p>Set scheduler wakeup threshold. Default is <c>medium</c>. |