aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-06-04 11:48:13 +0200
committerRickard Green <[email protected]>2013-06-04 11:48:13 +0200
commite4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479 (patch)
tree8d55ef4992ddccf03999da08adfb0d7957fbf5ad /lib/stdlib
parent4a25ec13e624989af191a2297f904df87d8e3248 (diff)
parentb7081f310a8503855d10aeda35f4bc056be24bb3 (diff)
downloadotp-e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479.tar.gz
otp-e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479.tar.bz2
otp-e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479.zip
Merge branch 'maint'
* maint: erts: Document the +M<S>acul command line argument erts: Carrier pool information in allocator information erts: Use carrier pool for migration of carriers erts: Implement test case for carrier pool erts: Implement carrier pool erts: Fix type errors in info functions erts: Use Uint64 for call counts erts: Fix failing testcase alloc_SUITE:rbtree erts: Rename allocator aoffcbf to aoffcaobf erts: Remove unnecessary flag arguments in allocators erts: Remove SBMBC allocator erts: Add test for add_mbc and remove_mbc callbacks erts: Fix deallocation in removed carrier erts: Change naive list to rb-tree of carriers in AOFF allocator erts: Prepare aoff allocator for carrier migration erts: Make carrier header sizes customizable erts: Add "bestfit within carrier" for aoff allocator (aoffcbf) Conflicts: erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/ets_SUITE.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 85bd82a854..41449a1071 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -5675,10 +5675,9 @@ etsmem() ->
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]
+ [MBCS,SBCS | Acc]
end,
[],
MemInfo),