aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/common/erl_sys_common_misc.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-10-23 10:41:49 +0200
committerRickard Green <[email protected]>2014-10-23 10:41:49 +0200
commite97f9bc1672cb2d2c07d4133030528b43b26532c (patch)
treecd519abf66793978459558f38f64e554c31432db /erts/emulator/sys/common/erl_sys_common_misc.c
parentff3fae223431a9cb0d2a2852a07f9447960c92ed (diff)
parent404c44d58058da8cfead5dd310fcb24bf3e8d344 (diff)
downloadotp-e97f9bc1672cb2d2c07d4133030528b43b26532c.tar.gz
otp-e97f9bc1672cb2d2c07d4133030528b43b26532c.tar.bz2
otp-e97f9bc1672cb2d2c07d4133030528b43b26532c.zip
Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into maint
* rickard/maint-17/eager-check-io/OTP-12117: No eager check I/O on OSE Introduce support for eager check I/O scheduling
Diffstat (limited to 'erts/emulator/sys/common/erl_sys_common_misc.c')
-rw-r--r--erts/emulator/sys/common/erl_sys_common_misc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/sys/common/erl_sys_common_misc.c b/erts/emulator/sys/common/erl_sys_common_misc.c
index e3ba741058..e63f0bda54 100644
--- a/erts/emulator/sys/common/erl_sys_common_misc.c
+++ b/erts/emulator/sys/common/erl_sys_common_misc.c
@@ -44,6 +44,14 @@
#endif
#endif
+/*
+ * erts_check_io_time is used by the erl_check_io implementation. The
+ * global erts_check_io_time variable is declared here since there
+ * (often) exist two versions of erl_check_io (kernel-poll and
+ * non-kernel-poll), and we dont want two versions of this variable.
+ */
+erts_smp_atomic_t erts_check_io_time;
+
/* Written once and only once */
static int filename_encoding = ERL_FILENAME_UNKNOWN;