aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-04-23 11:58:24 +0200
committerRickard Green <[email protected]>2012-04-23 11:58:24 +0200
commit8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20 (patch)
tree1c991442a54585464b0954744aea3ec7800276f2 /erts/doc/src
parentcfea5eea406ba3af96588ff458e55de9a149d9c5 (diff)
parentb74e9a3d03d685345a8fa592b033a9d691e6e7c0 (diff)
downloadotp-8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20.tar.gz
otp-8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20.tar.bz2
otp-8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20.zip
Merge branch 'rickard/sched-wakeup-other/OTP-10033' into rickard/sched-wakeup-other-r15b01/OTP-10033
Conflicts: erts/emulator/beam/erl_process.c erts/vsn.mk
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index cfbc38f176..f23e8bd9b8 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -901,6 +901,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>.