aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test/ets_SUITE.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2011-07-11 15:40:42 +0200
committerErlang/OTP <[email protected]>2011-07-11 15:40:42 +0200
commit3b2f96b9a1f079c9e0502db7d11984597ea5c4f1 (patch)
treeeb14eeaeda15e219244540f0d270f212a5dc9554 /lib/stdlib/test/ets_SUITE.erl
parente0f60ce445b072b97353f3ab8f18c2f00b04cbe8 (diff)
parent1dfaae304dfcc4f249c62b5ab7ff3bd4acef0d50 (diff)
downloadotp-3b2f96b9a1f079c9e0502db7d11984597ea5c4f1.tar.gz
otp-3b2f96b9a1f079c9e0502db7d11984597ea5c4f1.tar.bz2
otp-3b2f96b9a1f079c9e0502db7d11984597ea5c4f1.zip
Merge branch 'rickard/sbmbc/OTP-9339' into maint-r14
* rickard/sbmbc/OTP-9339: Use separate memory carriers for small blocks
Diffstat (limited to 'lib/stdlib/test/ets_SUITE.erl')
-rw-r--r--lib/stdlib/test/ets_SUITE.erl19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 9d348b5f1a..c9d82ec5f5 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -5517,20 +5517,21 @@ etsmem() ->
case erlang:system_info({allocator,ets_alloc}) of
false -> undefined;
MemInfo ->
- MSBCS = lists:foldl(
- fun ({instance, _, L}, Acc) ->
- {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
- {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
- [MBCS,SBCS | Acc]
- end,
- [],
- MemInfo),
+ CS = lists:foldl(
+ fun ({instance, _, L}, Acc) ->
+ {value,{_,SBMBCS}} = lists:keysearch(sbmbcs, 1, L),
+ {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
+ {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
+ [SBMBCS,MBCS,SBCS | Acc]
+ end,
+ [],
+ MemInfo),
lists:foldl(
fun(L, {Bl0,BlSz0}) ->
{value,{_,Bl,_,_}} = lists:keysearch(blocks, 1, L),
{value,{_,BlSz,_,_}} = lists:keysearch(blocks_size, 1, L),
{Bl0+Bl,BlSz0+BlSz}
- end, {0,0}, MSBCS)
+ end, {0,0}, CS)
end},
{Mem,AllTabs}.