diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-23 19:48:00 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-23 19:48:00 +0100 |
| commit | a5638411f2d16f6648bb1c904206079df00d2471 (patch) | |
| tree | 4a7c7ca6073a1b84e37112a7c4ee556ce4877099 /erts/emulator/beam/erl_alloc.types | |
| parent | 9c07c8727f440b408dc2542634812ca944e97c78 (diff) | |
| parent | 0e566efe903fd2482c51762f1939bc292dca43e7 (diff) | |
| download | otp-a5638411f2d16f6648bb1c904206079df00d2471.tar.gz otp-a5638411f2d16f6648bb1c904206079df00d2471.tar.bz2 otp-a5638411f2d16f6648bb1c904206079df00d2471.zip | |
Merge branch 'sverker/enif_select/OTP-13684'
* sverker/enif_select: (31 commits)
Remove debug printout and comment
Fix nif_SUITE:select for old linux
Add docs for enif_compare_monitors and ErlNifMonitor
Fix ErlNifMonitor handling
Remove faulty debug ASSERT
erts: Skip nif_SUITE:select on windows
Fix enif_select for windows
Fix whitebox monitor tests
Fix erl_nif doc
Expand nif_SUITE:monitor_frenzy to verify dtor calls
Expand nif_SUITE:monitor_frenzy with binary_to_term
erts: Avoid revival of dying resource by dec_term
erts: Add enif_compare_monitors
erts: Try fix enif_select for windows
erts: Change return value for enif_select
erts: Add pid argument to enif_select
erts: Beautify enif_select
erts: Fix bad_fd_in_pollset error case for enif_select
erts: Add enif_monitor_process and enif_demonitor_process
erts: Rename ErlNifResource as ErtsResource
...
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 295db2fe9b..3d5de72ee7 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -402,6 +402,7 @@ type DRV_TAB LONG_LIVED SYSTEM drv_tab 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 NIF_SEL_D_STATE FIXED_SIZE SYSTEM enif_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 |