diff options
author | Rickard Green <[email protected]> | 2017-02-06 18:16:20 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-02-06 18:16:20 +0100 |
commit | 83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (patch) | |
tree | cbc6710e516e7883313ed1c122e4896a17746611 /erts/emulator/beam/erl_db_util.h | |
parent | 047e3bebbe1639e3f2c82431269c0f7100af55af (diff) | |
parent | fc0477a67641b9ba344de595b7fec2431208f8e6 (diff) | |
download | otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.tar.gz otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.tar.bz2 otp-83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb.zip |
Merge branch 'rickard/binary-refc' into maint
OTP-14202
* rickard/binary-refc:
Atomic reference count of binaries also in non-SMP
Conflicts:
erts/emulator/beam/beam_bp.c
Diffstat (limited to 'erts/emulator/beam/erl_db_util.h')
-rw-r--r-- | erts/emulator/beam/erl_db_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h index 49e5f6b4cf..3fb063797e 100644 --- a/erts/emulator/beam/erl_db_util.h +++ b/erts/emulator/beam/erl_db_util.h @@ -211,7 +211,7 @@ typedef struct db_fixation { */ typedef struct db_table_common { - erts_refc_t ref; /* fixation counter */ + erts_smp_refc_t ref; /* fixation counter */ #ifdef ERTS_SMP erts_smp_rwmtx_t rwlock; /* rw lock on table */ erts_smp_mtx_t fixlock; /* Protects fixations,megasec,sec,microsec */ @@ -260,7 +260,7 @@ typedef struct db_table_common { (DB_BAG | DB_SET | DB_DUPLICATE_BAG))) #define IS_TREE_TABLE(Status) (!!((Status) & \ DB_ORDERED_SET)) -#define NFIXED(T) (erts_refc_read(&(T)->common.ref,0)) +#define NFIXED(T) (erts_smp_refc_read(&(T)->common.ref,0)) #define IS_FIXED(T) (NFIXED(T) != 0) /* |