aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-09-02 20:04:47 +0200
committerSverker Eriksson <[email protected]>2016-09-19 15:50:15 +0200
commitfdc2f2b4a6f6314ae7c183dc4e39e19d05ac89e4 (patch)
tree623690761c72151fc0ce8977b573880dbd614bb2 /lib
parent25eb3fe353cb0f5c381107e43a865d3a312c8c25 (diff)
downloadotp-fdc2f2b4a6f6314ae7c183dc4e39e19d05ac89e4.tar.gz
otp-fdc2f2b4a6f6314ae7c183dc4e39e19d05ac89e4.tar.bz2
otp-fdc2f2b4a6f6314ae7c183dc4e39e19d05ac89e4.zip
erts: Fix ets_SUITE:memory
by simply asking for the size of struct ext_segtab
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/test/ets_SUITE.erl22
1 files changed, 3 insertions, 19 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index ea555f9c39..ecdac0deff 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -591,12 +591,6 @@ select_fail_do(Opts) ->
-define(S(T),ets:info(T,memory)).
--define(TAB_STRUCT_SZ, erts_debug:get_internal_state('DbTable_words')).
-%%-define(NORMAL_TAB_STRUCT_SZ, 26). %% SunOS5.8, 32-bit, non smp, private heap
-%%
-%% The hardcoded expected memory sizes (in words) are the ones we expect on:
-%% SunOS5.8, 32-bit, non smp, private heap
-%%
%% Whitebox test of ets:info(X, memory).
memory(Config) when is_list(Config) ->
@@ -698,25 +692,15 @@ chk_normal_tab_struct_size() ->
erlang:system_info(smp_support),
erlang:system_info(heap_type)},
io:format("System = ~p~n", [System]),
- io:format("?TAB_STRUCT_SZ=~p~n", [?TAB_STRUCT_SZ]),
ok.
-sizeof_ext_segtab() ->
- case {erlang:system_info(wordsize),
- erlang:system_info(smp_support)} of
- {4,true} -> 5 + 3;
- {4,false} -> 3 + 3;
- {8,true} -> 4 + 2;
- {8,false} -> 3 + 2
- end.
-
adjust_xmem([_T1,_T2,_T3,_T4], {A0,B0,C0,D0} = _Mem0, EstCnt) ->
%% Adjust for 64-bit, smp, and os:
%% Table struct size may differ.
- TabDiff = ?TAB_STRUCT_SZ,
- HTabDiff = TabDiff + EstCnt*sizeof_ext_segtab(),
- {A0+TabDiff, B0+HTabDiff, C0+HTabDiff, D0+HTabDiff}.
+ {TabSz, EstSz} = erts_debug:get_internal_state('DbTable_words'),
+ HTabSz = TabSz + EstCnt*EstSz,
+ {A0+TabSz, B0+HTabSz, C0+HTabSz, D0+HTabSz}.
%% Misc. whitebox tests
t_whitebox(Config) when is_list(Config) ->