diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-12 16:17:42 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-12 16:17:42 +0200 |
| commit | 66829b77b0becadecb2fef480b66f69e95498bf7 (patch) | |
| tree | 0831a7255d5b2b5e024cbe0f00856ae3e4aa1fec /lib | |
| parent | 80865e03583ebbee63a2a72be708f28c1e4a4f98 (diff) | |
| parent | 089b8c357f5e7c96605c8f8cab4b3c856081dc39 (diff) | |
| download | otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.gz otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.bz2 otp-66829b77b0becadecb2fef480b66f69e95498bf7.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 19 |
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}. |