diff options
| author | Rickard Green <[email protected]> | 2016-05-11 17:16:07 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-05-11 17:16:07 +0200 |
| commit | 8b544b523d915d1a54d505ec34182676f183a5e0 (patch) | |
| tree | 92ccb9a32a8fed32a19fabda8cbbb85887bca93d /erts/emulator/beam/global.h | |
| parent | e1ad5319f0b76460d9147ef04640c469f5a180d6 (diff) | |
| parent | 4aea719054a594a06aceb34afca0ea3df65ead77 (diff) | |
| download | otp-8b544b523d915d1a54d505ec34182676f183a5e0.tar.gz otp-8b544b523d915d1a54d505ec34182676f183a5e0.tar.bz2 otp-8b544b523d915d1a54d505ec34182676f183a5e0.zip | |
Merge branch 'rickard/ds-proc-exit/OTP-13123'
* rickard/ds-proc-exit/OTP-13123:
Add dirty_heap_access test case
Add dirty_call_while_terminated test case
Move dirty nif test cases into dirty_nif_SUITE
Add better support for communication with a process executing dirty NIF
Remove conditional dirty schedulers API
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 550db95ba8..1abcc6cbf4 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -57,6 +57,7 @@ struct enif_environment_t /* ErlNifEnv */ struct enif_tmp_obj_t* tmp_obj_list; int exception_thrown; /* boolean */ Process *tracee; + int exiting; /* boolean (dirty nifs might return in exiting state) */ }; extern void erts_pre_nif(struct enif_environment_t*, Process*, struct erl_module_nif*, Process* tracee); |