diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-12 16:02:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-12 16:02:04 +0200 |
| commit | 089b8c357f5e7c96605c8f8cab4b3c856081dc39 (patch) | |
| tree | 035992b3c4d81b7da52e6a42dfeb53b65f642942 /lib/stdlib | |
| parent | 2a5d951162e6d9c918132d60c5c39302399dfca4 (diff) | |
| parent | d328f453e7cd6e24856b0c80e0b8c4ed6def5461 (diff) | |
| download | otp-089b8c357f5e7c96605c8f8cab4b3c856081dc39.tar.gz otp-089b8c357f5e7c96605c8f8cab4b3c856081dc39.tar.bz2 otp-089b8c357f5e7c96605c8f8cab4b3c856081dc39.zip | |
Merge branch 'maint-r14' into dev
Conflicts:
erts/vsn.mk
Diffstat (limited to 'lib/stdlib')
| -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}. |