From cb604704efd28fafd0f8edce03db00f7fef53909 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 23 Sep 2014 18:06:44 +0200
Subject: Change default to "eager check I/O"

Conflicts:
	erts/emulator/beam/erl_process.c
---
 erts/doc/src/erl.xml             | 6 +++---
 erts/emulator/beam/erl_process.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'erts')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 141754e4f9..f3ada61f3e 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1144,9 +1144,9 @@
           <tag><marker id="+secio"><c>+secio true|false</c></marker></tag>
           <item>
 	    <p>Enable or disable eager check I/O scheduling. The default
-	    is currently <c>false</c>, but will most likely be changed
-	    to <c>true</c> in OTP 18. The behaviour before this flag
-	    was introduced corresponds to <c>+secio false</c>.</p>
+	    is currently <c>true</c>. The default was changed from <c>false</c>
+	    to <c>true</c> as of erts version 7.0. The behaviour before this
+	    flag was introduced corresponds to <c>+secio false</c>.</p>
 	    <p>The flag effects when schedulers will check for I/O
 	    operations possible to execute, and when such I/O operations
 	    will execute. As the name of the parameter implies,
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index e5bb1203c8..7b272885a7 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -152,7 +152,7 @@ extern BeamInstr beam_continue_exit[];
 /* Eager check I/O not supported on OSE yet. */
 int erts_eager_check_io = 0;
 #else
-int erts_eager_check_io = 0;
+int erts_eager_check_io = 1;
 #endif
 int erts_sched_compact_load;
 int erts_sched_balance_util = 0;
-- 
cgit v1.2.3