diff options
| author | Erlang/OTP <[email protected]> | 2016-07-23 10:43:05 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-07-23 10:43:05 +0200 |
| commit | f98d9839113030e144bc2607b5f2bb0e61105dbd (patch) | |
| tree | 757e76653231a43157e0ed4d0cfaef4124ba498e /lib | |
| parent | 5cf780148575f1ea4c460d7c9783831e6fbce9ff (diff) | |
| parent | 317013f45039e47296c7ddc5941cf0e5dd0feac2 (diff) | |
| download | otp-f98d9839113030e144bc2607b5f2bb0e61105dbd.tar.gz otp-f98d9839113030e144bc2607b5f2bb0e61105dbd.tar.bz2 otp-f98d9839113030e144bc2607b5f2bb0e61105dbd.zip | |
Merge branch 'sverker/update_counter-deadlock/ERL-188/OTP-13731' into maint-18
* sverker/update_counter-deadlock/ERL-188/OTP-13731:
erts: Add test ets_SUITE:update_counter_table_growth
erts: Fix deadlock in ets:update_counter/4
erts: Optimize db_finalize_dbterm_hash
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index 30a158d9e1..1ddc4e7868 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -49,6 +49,7 @@ fixtable_next/1, fixtable_insert/1, rename/1, rename_unnamed/1, evil_rename/1, update_element/1, update_counter/1, evil_update_counter/1, partly_bound/1, match_heavy/1]). -export([update_counter_with_default/1]). +-export([update_counter_table_growth/1]). -export([member/1]). -export([memory/1]). -export([select_fail/1]). @@ -102,6 +103,7 @@ heavy_lookup_element_do/1, member_do/1, otp_5340_do/1, otp_7665_do/1, meta_wb_do/1, do_heavy_concurrent/1, tab2file2_do/2, exit_large_table_owner_do/2, types_do/1, sleeper/0, memory_do/1, update_counter_with_default_do/1, + update_counter_table_growth_do/1, ms_tracee_dummy/1, ms_tracee_dummy/2, ms_tracee_dummy/3, ms_tracee_dummy/4 ]). @@ -141,6 +143,7 @@ all() -> rename, rename_unnamed, evil_rename, update_element, update_counter, evil_update_counter, update_counter_with_default, partly_bound, + update_counter_table_growth, match_heavy, {group, fold}, member, t_delete_object, t_init_table, t_whitebox, t_delete_all_objects, t_insert_list, t_test_ms, t_select_delete, t_ets_dets, @@ -2063,6 +2066,16 @@ update_counter_with_default_do(Opts) -> ok. +update_counter_table_growth(_Config) -> + repeat_for_opts(update_counter_table_growth_do). + +update_counter_table_growth_do(Opts) -> + Set = ets_new(b, [set | Opts]), + [ets:update_counter(Set, N, {2, 1}, {N, 1}) || N <- lists:seq(1,10000)], + OrderedSet = ets_new(b, [ordered_set | Opts]), + [ets:update_counter(OrderedSet, N, {2, 1}, {N, 1}) || N <- lists:seq(1,10000)], + ok. + fixtable_next(doc) -> ["Check that a first-next sequence always works on a fixed table"]; fixtable_next(suite) -> |