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/beam/erl_alloc.types | |
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/beam/erl_alloc.types')
-rw-r--r-- | erts/emulator/beam/erl_alloc.types | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 37354b7f8d..029ac09b26 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -397,6 +397,7 @@ type DRV_EV_STATE LONG_LIVED SYSTEM driver_event_state type DRV_EV_D_STATE FIXED_SIZE SYSTEM driver_event_data_state type DRV_SEL_D_STATE FIXED_SIZE SYSTEM driver_select_data_state type FD_LIST SHORT_LIVED SYSTEM fd_list +type ACTIVE_FD_ARR SHORT_LIVED SYSTEM active_fd_array type POLLSET LONG_LIVED SYSTEM pollset type POLLSET_UPDREQ SHORT_LIVED SYSTEM pollset_update_req type POLL_FDS LONG_LIVED SYSTEM poll_fds |