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

1 files changed, 11 insertions, 1 deletions

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index cb7278696f..75389107bb 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -3542,8 +3542,14 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 	else if (ERTS_IS_ATOM_STR("DbTable_words", BIF_ARG_1)) {
 	    /* Used by ets_SUITE (stdlib) */
 	    size_t words = (sizeof(DbTable) + sizeof(Uint) - 1)/sizeof(Uint);
-	    BIF_RET(make_small((Uint) words));
+            Eterm* hp = HAlloc(BIF_P ,3);
+	    BIF_RET(TUPLE2(hp, make_small((Uint) words),
+                           erts_ets_hash_sizeof_ext_segtab()));
 	}
+        else if (ERTS_IS_ATOM_STR("DbTable_meta", BIF_ARG_1)) {
+            /* Used by ets_SUITE (stdlib) */
+            BIF_RET(erts_ets_get_meta_state(BIF_P));
+        }
 	else if (ERTS_IS_ATOM_STR("check_io_debug", BIF_ARG_1)) {
 	    /* Used by driver_SUITE (emulator) */
 	    Uint sz, *szp;
@@ -4277,6 +4283,10 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
             }
             BIF_RET(am_ok);
         }
+        else if (ERTS_IS_ATOM_STR("DbTable_meta", BIF_ARG_1)) {
+            /* Used by ets_SUITE (stdlib) */
+            BIF_RET(erts_ets_restore_meta_state(BIF_P, BIF_ARG_2));
+        }
     }
 
     BIF_ERROR(BIF_P, BADARG);