Merge PR-1844 from arcz/ets_count OTP-15163

Use erlang:system_info(ets_count) and improve docs

5 files changed, 108 insertions, 105 deletions

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 0a98e9c822..29b1d106cd 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -7581,7 +7581,7 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="75"/>
+      <name name="system_info" arity="1" clause_i="76"/>
       <fsummary>System info overview.</fsummary>
       <desc>
         <p>Returns information about the current system.
@@ -7629,6 +7629,7 @@ ok
             <p>
               <seealso marker="#system_info_atom_count"><c>atom_count</c></seealso>,
               <seealso marker="#system_info_atom_limit"><c>atom_limit</c></seealso>,
+              <seealso marker="#system_info_ets_count"><c>ets_count</c></seealso>,
               <seealso marker="#system_info_ets_limit"><c>ets_limit</c></seealso>,
               <seealso marker="#system_info_port_count"><c>port_count</c></seealso>,
               <seealso marker="#system_info_port_limit"><c>port_limit</c></seealso>,
@@ -7872,8 +7873,8 @@ ok
       <name name="system_info" arity="1" clause_i="12"
 	    anchor="system_info_cpu_topology"/>           <!-- cpu_topology -->
       <name name="system_info" arity="1" clause_i="13"/>  <!-- {cpu_topology, _} -->
-      <name name="system_info" arity="1" clause_i="37"/>  <!-- logical_processors -->
-      <name name="system_info" arity="1" clause_i="72"/>  <!-- update_cpu_info -->
+      <name name="system_info" arity="1" clause_i="38"/>  <!-- logical_processors -->
+      <name name="system_info" arity="1" clause_i="73"/>  <!-- update_cpu_info -->
       <fsummary>Information about the CPU topology of the system.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -8024,16 +8025,16 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="30"
+      <name name="system_info" arity="1" clause_i="31"
 	    anchor="system_info_process"/>  <!-- fullsweep_after -->
-      <name name="system_info" arity="1" clause_i="31"/>  <!-- garbage_collection -->
-      <name name="system_info" arity="1" clause_i="32"/>  <!-- heap_sizes -->
-      <name name="system_info" arity="1" clause_i="33"/>  <!-- heap_type -->
-      <name name="system_info" arity="1" clause_i="39"/>  <!-- max_heap_size -->
-      <name name="system_info" arity="1" clause_i="40"/>  <!-- message_queue_data -->
-      <name name="system_info" arity="1" clause_i="41"/>  <!-- min_heap_size -->
-      <name name="system_info" arity="1" clause_i="42"/>  <!-- min_bin_vheap_size -->
-      <name name="system_info" arity="1" clause_i="56"/>  <!-- procs -->
+      <name name="system_info" arity="1" clause_i="32"/>  <!-- garbage_collection -->
+      <name name="system_info" arity="1" clause_i="33"/>  <!-- heap_sizes -->
+      <name name="system_info" arity="1" clause_i="34"/>  <!-- heap_type -->
+      <name name="system_info" arity="1" clause_i="40"/>  <!-- max_heap_size -->
+      <name name="system_info" arity="1" clause_i="41"/>  <!-- message_queue_data -->
+      <name name="system_info" arity="1" clause_i="42"/>  <!-- min_heap_size -->
+      <name name="system_info" arity="1" clause_i="43"/>  <!-- min_bin_vheap_size -->
+      <name name="system_info" arity="1" clause_i="57"/>  <!-- procs -->
       <fsummary>Information about the default process heap settings.</fsummary>
       <type name="message_queue_data"/>
       <type name="max_heap_size"/>
@@ -8143,14 +8144,14 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="6"
-	    anchor="system_info_limits"/>   <!-- atom_count -->
+      <name name="system_info" arity="1" clause_i="6" anchor="system_info_limits"/>   <!-- atom_count -->
       <name name="system_info" arity="1" clause_i="7"/>   <!-- atom_limit -->
-      <name name="system_info" arity="1" clause_i="29"/>  <!-- ets_limit -->
-      <name name="system_info" arity="1" clause_i="52"/>  <!-- port_count -->
-      <name name="system_info" arity="1" clause_i="53"/>  <!-- port_limit -->
-      <name name="system_info" arity="1" clause_i="54"/>  <!-- process_count -->
-      <name name="system_info" arity="1" clause_i="55"/>  <!-- process_limit -->
+      <name name="system_info" arity="1" clause_i="29"/>  <!-- ets_count -->
+      <name name="system_info" arity="1" clause_i="30"/>  <!-- ets_limit -->
+      <name name="system_info" arity="1" clause_i="53"/>  <!-- port_count -->
+      <name name="system_info" arity="1" clause_i="54"/>  <!-- port_limit -->
+      <name name="system_info" arity="1" clause_i="55"/>  <!-- process_count -->
+      <name name="system_info" arity="1" clause_i="56"/>  <!-- process_limit -->
       <fsummary>Information about various system limits.</fsummary>
       <desc>
         <marker id="system_info_limits"/>
@@ -8173,7 +8174,7 @@ ok
             <c>erl(1)</c>.
             </p>
           </item>
-	  <tag><marker id="system_info_ets_count"/>
+          <tag><marker id="system_info_ets_count"/>
             <c>ets_count</c></tag>
           <item>
             <p>Returns the number of ETS tables currently existing at the
@@ -8225,13 +8226,13 @@ ok
     <func>
       <name name="system_info" arity="1" clause_i="26"
 	    anchor="system_info_time"/>  <!-- end_time -->
-      <name name="system_info" arity="1" clause_i="49"/>  <!-- os_monotonic_time_source -->
-      <name name="system_info" arity="1" clause_i="50"/>  <!-- os_system_time_source -->
-      <name name="system_info" arity="1" clause_i="62"/>  <!-- start_time -->
-      <name name="system_info" arity="1" clause_i="67"/>  <!-- time_correction -->
-      <name name="system_info" arity="1" clause_i="68"/>  <!-- time_offset -->
-      <name name="system_info" arity="1" clause_i="69"/>  <!-- time_warp_mode -->
-      <name name="system_info" arity="1" clause_i="70"/>  <!-- tolerant_timeofday -->
+      <name name="system_info" arity="1" clause_i="50"/>  <!-- os_monotonic_time_source -->
+      <name name="system_info" arity="1" clause_i="51"/>  <!-- os_system_time_source -->
+      <name name="system_info" arity="1" clause_i="63"/>  <!-- start_time -->
+      <name name="system_info" arity="1" clause_i="68"/>  <!-- time_correction -->
+      <name name="system_info" arity="1" clause_i="69"/>  <!-- time_offset -->
+      <name name="system_info" arity="1" clause_i="70"/>  <!-- time_warp_mode -->
+      <name name="system_info" arity="1" clause_i="71"/>  <!-- tolerant_timeofday -->
       <fsummary>Information about system time.</fsummary>
       <desc>
         <marker id="system_info_time_tags"/>
@@ -8455,16 +8456,16 @@ ok
 	    anchor="system_info_scheduler"/>  <!-- dirty_cpu_schedulers -->
       <name name="system_info" arity="1" clause_i="18"/>  <!-- dirty_cpu_schedulers_online -->
       <name name="system_info" arity="1" clause_i="19"/>  <!-- dirty_io_schedulers -->
-      <name name="system_info" arity="1" clause_i="44"/>  <!-- multi_scheduling -->
-      <name name="system_info" arity="1" clause_i="45"/>  <!-- multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="47"/>  <!-- normal_multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="57"/>  <!-- scheduler_bind_type -->
-      <name name="system_info" arity="1" clause_i="58"/>  <!-- scheduler_bindings -->
-      <name name="system_info" arity="1" clause_i="59"/>  <!-- scheduler_id -->
-      <name name="system_info" arity="1" clause_i="60"/>  <!-- schedulers -->
-      <name name="system_info" arity="1" clause_i="61"/>  <!-- smp_support -->
-      <name name="system_info" arity="1" clause_i="65"/>  <!-- threads -->
-      <name name="system_info" arity="1" clause_i="66"/>  <!-- thread_pool_size -->
+      <name name="system_info" arity="1" clause_i="45"/>  <!-- multi_scheduling -->
+      <name name="system_info" arity="1" clause_i="46"/>  <!-- multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="49"/>  <!-- normal_multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="58"/>  <!-- scheduler_bind_type -->
+      <name name="system_info" arity="1" clause_i="59"/>  <!-- scheduler_bindings -->
+      <name name="system_info" arity="1" clause_i="60"/>  <!-- scheduler_id -->
+      <name name="system_info" arity="1" clause_i="61"/>  <!-- schedulers -->
+      <name name="system_info" arity="1" clause_i="62"/>  <!-- smp_support -->
+      <name name="system_info" arity="1" clause_i="66"/>  <!-- threads -->
+      <name name="system_info" arity="1" clause_i="67"/>  <!-- thread_pool_size -->
       <fsummary>Information about system schedulers.</fsummary>
       <desc>
         <marker id="system_info_scheduler_tags"/>
@@ -8851,53 +8852,54 @@ ok
       <!-- <name name="system_info" arity="1" clause_i="26"/>  end_time -->
       <!-- <name name="system_info" arity="1" clause_i="27"/>  elib_malloc -->
       <!-- <name name="system_info" arity="1" clause_i="28"/>  eager_check_io, removed -->
-      <!-- <name name="system_info" arity="1" clause_i="29"/>  ets_limit -->
-      <!-- <name name="system_info" arity="1" clause_i="30"/>  fullsweep_after -->
-      <!-- <name name="system_info" arity="1" clause_i="31"/>  garbage_collection -->
-      <!-- <name name="system_info" arity="1" clause_i="32"/>  heap_sizes -->
-      <!-- <name name="system_info" arity="1" clause_i="33"/>  heap_type -->
-      <name name="system_info" arity="1" clause_i="34"/>  <!-- info -->
-      <name name="system_info" arity="1" clause_i="35"/>  <!-- kernel_poll -->
-      <name name="system_info" arity="1" clause_i="36"/>  <!-- loaded -->
-      <!-- <name name="system_info" arity="1" clause_i="37"/>  logical_processors -->
-      <name name="system_info" arity="1" clause_i="38"/>  <!-- machine -->
-      <!-- <name name="system_info" arity="1" clause_i="39"/>  max_heap_size -->
-      <!-- <name name="system_info" arity="1" clause_i="40"/>  message_queue_data -->
-      <!-- <name name="system_info" arity="1" clause_i="41"/>  min_heap_size -->
-      <!-- <name name="system_info" arity="1" clause_i="42"/>  min_bin_vheap_size -->
-      <name name="system_info" arity="1" clause_i="43"/>  <!-- modified_timing_level -->
-      <!-- <name name="system_info" arity="1" clause_i="44"/>  multi_scheduling -->
-      <!-- <name name="system_info" arity="1" clause_i="45"/>  multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="46"/>  <!-- nif_version -->
-      <!-- n<name name="system_info" arity="1" clause_i="47"/>  ormal_multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="48"/>  <!-- otp_release -->
-      <!-- <name name="system_info" arity="1" clause_i="49"/>  os_monotonic_time_source -->
-      <!-- <name name="system_info" arity="1" clause_i="50"/>  os_system_time_source -->
-      <name name="system_info" arity="1" clause_i="51"/>  <!-- port_parallelism -->
-      <!-- <name name="system_info" arity="1" clause_i="52"/>  port_count -->
-      <!-- <name name="system_info" arity="1" clause_i="53"/>  port_limit -->
-      <!-- <name name="system_info" arity="1" clause_i="54"/>  process_count -->
-      <!-- <name name="system_info" arity="1" clause_i="55"/>  process_limit -->
-      <!-- <name name="system_info" arity="1" clause_i="56"/>  procs -->
-      <!-- <name name="system_info" arity="1" clause_i="57"/>  scheduler_bind_type -->
-      <!-- <name name="system_info" arity="1" clause_i="58"/>  scheduler_bindings -->
-      <!-- <name name="system_info" arity="1" clause_i="59"/>  scheduler_id -->
-      <!-- <name name="system_info" arity="1" clause_i="60"/>  schedulers -->
-      <!-- <name name="system_info" arity="1" clause_i="61"/>  smp_support -->
-      <!-- <name name="system_info" arity="1" clause_i="62"/>  start_time -->
-      <name name="system_info" arity="1" clause_i="63"/>  <!-- system_version -->
-      <name name="system_info" arity="1" clause_i="64"/>  <!-- system_architecture -->
-      <!-- <name name="system_info" arity="1" clause_i="65"/>  threads -->
-      <!-- <name name="system_info" arity="1" clause_i="66"/>  thread_pool_size -->
-      <!-- <name name="system_info" arity="1" clause_i="67"/>  time_correction -->
-      <!-- <name name="system_info" arity="1" clause_i="68"/>  time_offset -->
-      <!-- <name name="system_info" arity="1" clause_i="69"/>  time_warp_mode -->
-      <!-- <name name="system_info" arity="1" clause_i="70"/>  tolerant_timeofday -->
-      <name name="system_info" arity="1" clause_i="71"/>  <!-- trace_control_word -->
-      <!-- <name name="system_info" arity="1" clause_i="72"/>  update_cpu_info -->
-      <name name="system_info" arity="1" clause_i="73"/>  <!-- version -->
-      <name name="system_info" arity="1" clause_i="74"/>  <!-- wordsize -->
-      <!-- <name name="system_info" arity="1" clause_i="75"/>  overview -->
+      <!-- <name name="system_info" arity="1" clause_i="29"/>  ets_count -->
+      <!-- <name name="system_info" arity="1" clause_i="30"/>  ets_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="31"/>  fullsweep_after -->
+      <!-- <name name="system_info" arity="1" clause_i="32"/>  garbage_collection -->
+      <!-- <name name="system_info" arity="1" clause_i="33"/>  heap_sizes -->
+      <!-- <name name="system_info" arity="1" clause_i="34"/>  heap_type -->
+      <name name="system_info" arity="1" clause_i="35"/>  <!-- info -->
+      <name name="system_info" arity="1" clause_i="36"/>  <!-- kernel_poll -->
+      <name name="system_info" arity="1" clause_i="37"/>  <!-- loaded -->
+      <!-- <name name="system_info" arity="1" clause_i="38"/>  logical_processors -->
+      <name name="system_info" arity="1" clause_i="39"/>  <!-- machine -->
+      <!-- <name name="system_info" arity="1" clause_i="40"/>  max_heap_size -->
+      <!-- <name name="system_info" arity="1" clause_i="41"/>  message_queue_data -->
+      <!-- <name name="system_info" arity="1" clause_i="42"/>  min_heap_size -->
+      <!-- <name name="system_info" arity="1" clause_i="43"/>  min_bin_vheap_size -->
+      <name name="system_info" arity="1" clause_i="44"/>  <!-- modified_timing_level -->
+      <!-- <name name="system_info" arity="1" clause_i="45"/>  multi_scheduling -->
+      <!-- <name name="system_info" arity="1" clause_i="46"/>  multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="47"/>  <!-- nif_version -->
+      <!-- n<name name="system_info" arity="1" clause_i="48"/>  ormal_multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="49"/>  <!-- otp_release -->
+      <!-- <name name="system_info" arity="1" clause_i="50"/>  os_monotonic_time_source -->
+      <!-- <name name="system_info" arity="1" clause_i="51"/>  os_system_time_source -->
+      <name name="system_info" arity="1" clause_i="52"/>  <!-- port_parallelism -->
+      <!-- <name name="system_info" arity="1" clause_i="53"/>  port_count -->
+      <!-- <name name="system_info" arity="1" clause_i="54"/>  port_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="55"/>  process_count -->
+      <!-- <name name="system_info" arity="1" clause_i="56"/>  process_limit -->
+      <!-- <name name="system_info" arity="1" clause_i="57"/>  procs -->
+      <!-- <name name="system_info" arity="1" clause_i="58"/>  scheduler_bind_type -->
+      <!-- <name name="system_info" arity="1" clause_i="59"/>  scheduler_bindings -->
+      <!-- <name name="system_info" arity="1" clause_i="60"/>  scheduler_id -->
+      <!-- <name name="system_info" arity="1" clause_i="61"/>  schedulers -->
+      <!-- <name name="system_info" arity="1" clause_i="62"/>  smp_support -->
+      <!-- <name name="system_info" arity="1" clause_i="63"/>  start_time -->
+      <name name="system_info" arity="1" clause_i="64"/>  <!-- system_version -->
+      <name name="system_info" arity="1" clause_i="65"/>  <!-- system_architecture -->
+      <!-- <name name="system_info" arity="1" clause_i="66"/>  threads -->
+      <!-- <name name="system_info" arity="1" clause_i="67"/>  thread_pool_size -->
+      <!-- <name name="system_info" arity="1" clause_i="68"/>  time_correction -->
+      <!-- <name name="system_info" arity="1" clause_i="69"/>  time_offset -->
+      <!-- <name name="system_info" arity="1" clause_i="70"/>  time_warp_mode -->
+      <!-- <name name="system_info" arity="1" clause_i="71"/>  tolerant_timeofday -->
+      <name name="system_info" arity="1" clause_i="72"/>  <!-- trace_control_word -->
+      <!-- <name name="system_info" arity="1" clause_i="73"/>  update_cpu_info -->
+      <name name="system_info" arity="1" clause_i="74"/>  <!-- version -->
+      <name name="system_info" arity="1" clause_i="75"/>  <!-- wordsize -->
+      <!-- <name name="system_info" arity="1" clause_i="76"/>  overview -->
       <fsummary>Information about the system.</fsummary>
       <desc>
         <marker id="system_info_misc_tags"/>
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index f4f31b1e4b..75f6901258 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2681,11 +2681,12 @@ tuple_to_list(_Tuple) ->
          (dist_ctrl) -> {Node :: node(),
                          ControllingEntity :: port() | pid()};
          (driver_version) -> string();
-	 (dynamic_trace) -> none | dtrace | systemtap;
+         (dynamic_trace) -> none | dtrace | systemtap;
          (dynamic_trace_probes) -> boolean();
          (end_time) -> non_neg_integer();
          (elib_malloc) -> false;
          (eager_check_io) -> boolean();
+         (ets_count) -> pos_integer();
          (ets_limit) -> pos_integer();
          (fullsweep_after) -> {fullsweep_after, non_neg_integer()};
          (garbage_collection) -> [{atom(), integer()}];
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 063b19e533..3a24986381 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -94,7 +94,7 @@ sys_info() ->
      {port_limit, erlang:system_info(port_limit)},
      {port_count, erlang:system_info(port_count)},
      {ets_limit,  erlang:system_info(ets_limit)},
-     {ets_count, length(ets:all())},
+     {ets_count, erlang:system_info(ets_count)},
      {dist_buf_busy_limit, erlang:system_info(dist_buf_busy_limit)}
      | MemInfo].
 
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index 73219f8fd8..3597d6d94b 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -78,7 +78,7 @@ normal(Conf) when is_list(Conf) ->
     BeamFile = Simple ++ ".beam",
     simple_file(Source),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     do_normal(Source, PrivDir, BeamFile, []),
@@ -95,7 +95,7 @@ normal(Conf) when is_list(Conf) ->
 
     file:delete(BeamFile),
     file:delete(Source),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     ok.
 
@@ -173,7 +173,7 @@ error(Conf) when is_list(Conf) ->
     WrongFile = Simple ++ "foo.beam",
     simple_file(Source),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
     {ok,_} = compile:file(Source, [{outdir,PrivDir},debug_info]),
     ACopy = filename:join(PrivDir, "a_copy.beam"),
@@ -213,7 +213,7 @@ error(Conf) when is_list(Conf) ->
     %% we have eliminated them.
     ok = file:write_file(BeamFile, <<"FOR1",5:32,"BEAMfel">>),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     file:delete(Source),
     file:delete(WrongFile),
@@ -273,7 +273,7 @@ cmp(Conf) when is_list(Conf) ->
     {Source2D1, BeamFile2D1} = make_beam(Dir1, simple2, concat),
     {SourceD2, BeamFileD2} = make_beam(Dir2, simple, concat),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% cmp
@@ -300,7 +300,7 @@ cmp(Conf) when is_list(Conf) ->
     ver(not_a_directory, beam_lib:diff_dirs(foo, bar)),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     delete_files([SourceD1, BeamFileD1, Source2D1,
 		  BeamFile2D1, SourceD2, BeamFileD2]),
 
@@ -321,7 +321,7 @@ cmp_literals(Conf) when is_list(Conf) ->
     {SourceD1, BeamFileD1} = make_beam(Dir1, simple, constant),
     {SourceD2, BeamFileD2} = make_beam(Dir2, simple, constant2),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% cmp
@@ -334,7 +334,7 @@ cmp_literals(Conf) when is_list(Conf) ->
     ver(chunks_different, beam_lib:cmp(B1, B2)),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     delete_files([SourceD1, BeamFileD1, SourceD2, BeamFileD2]),
 
@@ -351,7 +351,7 @@ strip(Conf) when is_list(Conf) ->
     {Source4D1, BeamFile4D1} = make_beam(PrivDir, constant, constant),
     {Source5D1, BeamFile5D1} = make_beam(PrivDir, lines, lines),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% strip binary
@@ -392,7 +392,7 @@ strip(Conf) when is_list(Conf) ->
 	(catch lines:t(atom)),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     delete_files([SourceD1, BeamFileD1,
 		  Source2D1, BeamFile2D1,
@@ -457,7 +457,7 @@ building(Conf) when is_list(Conf) ->
 
     {SourceD1, BeamFileD1} = make_beam(Dir1, building, member),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% read all chunks
@@ -487,7 +487,7 @@ building(Conf) when is_list(Conf) ->
 		  end, ChunkIds),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     delete_files([SourceD1, BeamFileD1, BeamFileD2]),
     file:del_dir(Dir1),
@@ -535,7 +535,7 @@ encrypted_abstr_1(Conf) ->
     %% Avoid getting an extra port when crypto starts erl_ddll.
     erl_ddll:start(),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     Key = "#a_crypto_key",
@@ -549,7 +549,7 @@ encrypted_abstr_1(Conf) ->
     ok = crypto:stop(),			%To get rid of extra ets tables.
     file:delete(BeamFile),
     file:delete(Source),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     ok.
 
@@ -658,7 +658,7 @@ encrypted_abstr_file_1(Conf) ->
     %% Avoid getting an extra port when crypto starts erl_ddll.
     erl_ddll:start(),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     Key = "Long And niCe 99Krypto Key",
@@ -676,7 +676,7 @@ encrypted_abstr_file_1(Conf) ->
     file:delete(filename:join(PrivDir, ".erlang.crypt")),
     file:delete(BeamFile),
     file:delete(Source),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     ok.
 
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 018f632948..4ec75f7962 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -2233,18 +2233,18 @@ variables(Conf) when is_list(Conf) ->
     {{error, _, _}, _} = xref_base:variables(S108, [{verbose,false}]),
     {ok, S109} = xref_base:set_library_path(S108, [], [{verbose,false}]),
 
-    Tabs = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     {ok, S110} = eval("Eplus := closure E, TT := Eplus",
                       'closure()', S109),
     {{ok, [{user, ['Eplus','TT']}]}, S111} = xref_base:variables(S110),
     {ok, S112} = xref_base:forget(S111, ['TT','Eplus']),
-    true = Tabs =:= length(ets:all()),
+    true = NoOfTables =:= erlang:system_info(ets_count),
 
     {ok, NS0} = eval("Eplus := closure E", 'closure()', S112),
     {{ok, [{user, ['Eplus']}]}, NS} = xref_base:variables(NS0),
     ok = xref_base:delete(NS),
-    true = Tabs =:= length(ets:all()),
+    true = NoOfTables =:= erlang:system_info(ets_count),
 
     ok = file:delete(Beam),
     ok.