diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-14 19:25:16 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-20 20:06:35 +0100 |
| commit | cb2a5bd9e86ba49d9bbc83b3d8383fbe0cc90715 (patch) | |
| tree | 12379e03effc12b9a18702aa86028c080c81bb2e /erts/emulator/beam/global.h | |
| parent | 82d3513f95198b0a4295ba866a78ae6c137a34d5 (diff) | |
| download | otp-cb2a5bd9e86ba49d9bbc83b3d8383fbe0cc90715.tar.gz otp-cb2a5bd9e86ba49d9bbc83b3d8383fbe0cc90715.tar.bz2 otp-cb2a5bd9e86ba49d9bbc83b3d8383fbe0cc90715.zip | |
erts: Avoid revival of dying resource by dec_term
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index d4a1225bdd..776f2c599b 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -87,6 +87,9 @@ typedef struct { erts_smp_mtx_t lock; ErtsMonitor* root; + int pending_failed_fire; + int is_dying; + size_t user_data_sz; } ErtsResourceMonitors; @@ -94,14 +97,11 @@ typedef struct ErtsResource_ { struct enif_resource_type_t* type; ErtsResourceMonitors* monitors; -#ifdef ARCH_32 - byte align__[4]; -#endif #ifdef DEBUG erts_refc_t nif_refc; - int dbg_is_dying; -# ifdef ARCH_64 - byte dbg_align__[4]; +#else +# ifdef ARCH_32 + byte align__[4]; # endif #endif char data[1]; |