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:45:03 +0200
committerRickard Green <[email protected]>2014-10-23 10:45:03 +0200
commitfd64aab6bdb78688de780925d1d23fd565c58e33 (patch)
tree7b0f05ac2452cf57205e44762dc65292fa804da5 /erts/emulator/sys/common/erl_sys_common_misc.c
parent527ae7b5030ba7339eba5ba4089888c8f90e2879 (diff)
parent3b972c26208c99282215766c3716ae23a1ac6214 (diff)
downloadotp-fd64aab6bdb78688de780925d1d23fd565c58e33.tar.gz
otp-fd64aab6bdb78688de780925d1d23fd565c58e33.tar.bz2
otp-fd64aab6bdb78688de780925d1d23fd565c58e33.zip
Merge branch 'rickard/master/eager-check-io/OTP-12117'
* rickard/master/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;