diff options
| author | Rickard Green <[email protected]> | 2014-09-25 17:15:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-09-25 17:15:27 +0200 |
| commit | 3b972c26208c99282215766c3716ae23a1ac6214 (patch) | |
| tree | 89312b5b944dc3b69a89d1b6b77f6392d7097f21 /erts/emulator/sys/unix | |
| parent | f4a57a8e94b9eb5f21adfd1c8da62429a3cb35c1 (diff) | |
| parent | 404c44d58058da8cfead5dd310fcb24bf3e8d344 (diff) | |
| download | otp-3b972c26208c99282215766c3716ae23a1ac6214.tar.gz otp-3b972c26208c99282215766c3716ae23a1ac6214.tar.bz2 otp-3b972c26208c99282215766c3716ae23a1ac6214.zip | |
Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into rickard/master/eager-check-io/OTP-12117
* rickard/maint-17/eager-check-io/OTP-12117:
No eager check I/O on OSE
Introduce support for eager check I/O scheduling
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/sys/unix')
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 3 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index 176fc049a7..b2fe34c1ac 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -135,9 +135,6 @@ /* File descriptors are numbers anc consecutively allocated on Unix */ #define ERTS_SYS_CONTINOUS_FD_NUMBERS -#define HAVE_ERTS_CHECK_IO_DEBUG -int erts_check_io_debug(void); - #ifndef ERTS_SMP # undef ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT # define ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index c3d7440409..0d677d5f34 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -284,7 +284,7 @@ struct { void (*check_io)(int); Uint (*size)(void); Eterm (*info)(void *); - int (*check_io_debug)(void); + int (*check_io_debug)(ErtsCheckIoDebugInfo *); } io_func = {0}; @@ -306,9 +306,9 @@ Eterm erts_check_io_info(void *p) } int -erts_check_io_debug(void) +erts_check_io_debug(ErtsCheckIoDebugInfo *ip) { - return (*io_func.check_io_debug)(); + return (*io_func.check_io_debug)(ip); } |