From c67615343b8ab10f10ffc40eccc24c6ec36cd9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Wed, 20 Jun 2018 09:44:32 +0200
Subject: Remove ad-hoc memory use calculations in tests

---
 lib/stdlib/test/ets_SUITE.erl | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 7a48d1d55e..fee8b204f4 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -6112,40 +6112,11 @@ etsmem() ->
 				   ets:info(T,memory),ets:info(T,type)}
 			end, ets:all()),
 
-    EtsAllocInfo = erlang:system_info({allocator,ets_alloc}),
+    EtsAllocSize = erts_debug:alloc_blocks_size(ets_alloc),
     ErlangMemoryEts = try erlang:memory(ets) catch error:notsup -> notsup end,
 
-    Mem =
-	{ErlangMemoryEts,
-	 case EtsAllocInfo of
-	     false -> undefined;
-	     MemInfo ->
-		 CS = lists:foldl(
-			fun ({instance, _, L}, Acc) ->
-				{value,{mbcs,MBCS}} = lists:keysearch(mbcs, 1, L),
-				{value,{sbcs,SBCS}} = lists:keysearch(sbcs, 1, L),
-				NewAcc = [MBCS, SBCS | Acc],
-				case lists:keysearch(mbcs_pool, 1, L) of
-				    {value,{mbcs_pool, MBCS_POOL}} ->
-					[MBCS_POOL|NewAcc];
-				    _ -> NewAcc
-				end
-			end,
-			[],
-			MemInfo),
-		 lists:foldl(
-		   fun(L, {Bl0,BlSz0}) ->
-			   {value,BlTup} = lists:keysearch(blocks, 1, L),
-			   blocks = element(1, BlTup),
-			   Bl = element(2, BlTup),
-			   {value,BlSzTup} = lists:keysearch(blocks_size, 1, L),
-			   blocks_size = element(1, BlSzTup),
-			   BlSz = element(2, BlSzTup),
-			   {Bl0+Bl,BlSz0+BlSz}
-		   end, {0,0}, CS)
-	 end},
-    {Mem,AllTabs}.
-
+    Mem = {ErlangMemoryEts, EtsAllocSize},
+    {Mem, AllTabs}.
 
 verify_etsmem(MI) ->
     wait_for_test_procs(),
-- 
cgit v1.2.3