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_process.h | |
| 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_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 9b740f049e..3b0798207e 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1362,6 +1362,7 @@ Uint64 erts_ensure_later_proc_interval(Uint64); Uint64 erts_step_proc_interval(void); int erts_setup_nif_gc(Process* proc, Eterm** objv, int* nobj); /* see erl_nif.c */ +void erts_destroy_nif_export(void *); /* see erl_nif.c */ ErtsProcList *erts_proclist_create(Process *); void erts_proclist_destroy(ErtsProcList *); @@ -1814,9 +1815,9 @@ erts_psd_set(Process *p, ErtsProcLocks plocks, int ix, void *data) ((ErtsProcSysTaskQs *) erts_psd_set((P), (L), ERTS_PSD_DELAYED_GC_TASK_QS, (void *) (PBT))) #define ERTS_PROC_GET_NIF_TRAP_EXPORT(P) \ - ((Export *) erts_psd_get((P), ERTS_PSD_NIF_TRAP_EXPORT)) -#define ERTS_PROC_SET_NIF_TRAP_EXPORT(P, L, DSTE) \ - ((Export *) erts_psd_set((P), (L), ERTS_PSD_NIF_TRAP_EXPORT, (void *) (DSTE))) + erts_psd_get((P), ERTS_PSD_NIF_TRAP_EXPORT) +#define ERTS_PROC_SET_NIF_TRAP_EXPORT(P, L, NTE) \ + erts_psd_set((P), (L), ERTS_PSD_NIF_TRAP_EXPORT, (void *) (NTE)) ERTS_GLB_INLINE Eterm erts_proc_get_error_handler(Process *p); |