diff options
| author | Sverker Eriksson <[email protected]> | 2016-09-21 15:50:48 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-09-21 15:50:48 +0200 |
| commit | e8411511fdb2a830b284e3a37ca8a2dc749ff79f (patch) | |
| tree | a5bda7b07281176fa3452a1fb36526761fd97003 /erts/emulator/beam/erl_db.h | |
| parent | d419183bb3d2204144492104f6f33a5753127b12 (diff) | |
| parent | d100187bde4f3f555b4f3cd9561ec8c67a528895 (diff) | |
| download | otp-e8411511fdb2a830b284e3a37ca8a2dc749ff79f.tar.gz otp-e8411511fdb2a830b284e3a37ca8a2dc749ff79f.tar.bz2 otp-e8411511fdb2a830b284e3a37ca8a2dc749ff79f.zip | |
Merge branch 'sverker/ets-load-factor/OTP-13903'
* sverker/ets-load-factor:
erts: Unify reduction count for ets:select
stdlib: Cuddle ets_SUITE for valgrind
stdlib: Fix ets_SUITE:smp_select_delete
erts: Tweak ets grow/shrink to keep up at contention
erts: Fix ets_SUITE:memory
erts: Suppress failed ETS memory checks
erts: Reduce ets hash load factor
erts: Enable a smaller first hash segment for ets
erts: Redesign ets with separate segment tables
erts: Remove unnecessary access of 'is_resizing'
erts: Add ErtsSizeofMember macro
erts: Add ErtsContainerStruct_ for array members
Diffstat (limited to 'erts/emulator/beam/erl_db.h')
| -rw-r--r-- | erts/emulator/beam/erl_db.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db.h b/erts/emulator/beam/erl_db.h index 1d26c49652..f7eb3dc45c 100644 --- a/erts/emulator/beam/erl_db.h +++ b/erts/emulator/beam/erl_db.h @@ -90,6 +90,8 @@ extern Export ets_select_continue_exp; extern erts_smp_atomic_t erts_ets_misc_mem_size; Eterm erts_ets_colliding_names(Process*, Eterm name, Uint cnt); +Eterm erts_ets_get_meta_state(Process* p); +Eterm erts_ets_restore_meta_state(Process* p, Eterm target_state); Uint erts_db_get_max_tabs(void); @@ -267,7 +269,5 @@ erts_db_free_nt(ErtsAlcType_t type, void *ptr, Uint size) #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */ -#undef ERTS_DB_ALC_MEM_UPDATE_ - #endif /* #if defined(ERTS_WANT_DB_INTERNAL__) && !defined(ERTS_HAVE_DB_INTERNAL__) */ |