aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2014-09-24 17:48:28 +0200
committerRickard Green <rickard@erlang.org>2014-09-25 17:06:30 +0200
commit404c44d58058da8cfead5dd310fcb24bf3e8d344 (patch)
tree571d3c19afa96aaa8406baf8e561f02807a2479f /erts/emulator
parent3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61 (diff)
downloadotp-404c44d58058da8cfead5dd310fcb24bf3e8d344.tar.gz
otp-404c44d58058da8cfead5dd310fcb24bf3e8d344.tar.bz2
otp-404c44d58058da8cfead5dd310fcb24bf3e8d344.zip
No eager check I/O on OSE
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_init.c5
-rw-r--r--erts/emulator/beam/erl_process.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index ef77e1d7fc..61f8385efc 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -1678,9 +1678,12 @@ erl_start(int argc, char **argv)
}
else if (has_prefix("ecio", sub_param)) {
arg = get_arg(sub_param+4, argv[i+1], &i);
+#ifndef __OSE__
if (sys_strcmp("true", arg) == 0)
erts_eager_check_io = 1;
- else if (sys_strcmp("false", arg) == 0)
+ else
+#endif
+ if (sys_strcmp("false", arg) == 0)
erts_eager_check_io = 0;
else {
erts_fprintf(stderr,
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 65abd87c08..e5bb1203c8 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -148,7 +148,12 @@ extern BeamInstr beam_apply[];
extern BeamInstr beam_exit[];
extern BeamInstr beam_continue_exit[];
+#ifdef __OSE__
+/* Eager check I/O not supported on OSE yet. */
+int erts_eager_check_io = 0;
+#else
int erts_eager_check_io = 0;
+#endif
int erts_sched_compact_load;
int erts_sched_balance_util = 0;
Uint erts_no_schedulers;