diff options
| author | Rickard Green <[email protected]> | 2014-09-05 15:04:53 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-09-05 15:04:53 +0200 |
| commit | b3a7e7f84b6e6183113ee961b06d3765de7a48b3 (patch) | |
| tree | 38e5e4d32d003aed6fa9ab01fb60e9d07ba6f389 /erts/emulator/beam/erl_alloc.types | |
| parent | fbd740bcbd99899d2bd53742a9d9377ee738d98d (diff) | |
| parent | 18a38b9e5f5fbf4aa8fb7d349bc493c78626d3f6 (diff) | |
| download | otp-b3a7e7f84b6e6183113ee961b06d3765de7a48b3.tar.gz otp-b3a7e7f84b6e6183113ee961b06d3765de7a48b3.tar.bz2 otp-b3a7e7f84b6e6183113ee961b06d3765de7a48b3.zip | |
Merge branch 'vinoski/enif-schedule-nif' into maint
OTP-12128
* vinoski/enif-schedule-nif:
Fix leak of NIF exports
Use separate allocation type for NIF export
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.types | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 17ac6316b7..37354b7f8d 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -357,6 +357,7 @@ type DB_MS_PSDO_PROC LONG_LIVED_LOW ETS db_match_pseudo_proc type SCHDLR_DATA LONG_LIVED_LOW SYSTEM scheduler_data type LL_TEMP_TERM LONG_LIVED_LOW SYSTEM ll_temp_term +type NIF_TRAP_EXPORT STANDARD_LOW CODE nif_trap_export_entry type EXPORT LONG_LIVED_LOW CODE export_entry type MONITOR_SH STANDARD_LOW PROCESSES monitor_sh type NLINK_SH STANDARD_LOW PROCESSES nlink_sh @@ -375,6 +376,7 @@ type DB_MS_PSDO_PROC LONG_LIVED ETS db_match_pseudo_proc type SCHDLR_DATA LONG_LIVED SYSTEM scheduler_data type LL_TEMP_TERM LONG_LIVED SYSTEM ll_temp_term +type NIF_TRAP_EXPORT STANDARD CODE nif_trap_export_entry type EXPORT LONG_LIVED CODE export_entry type MONITOR_SH FIXED_SIZE PROCESSES monitor_sh type NLINK_SH FIXED_SIZE PROCESSES nlink_sh |