diff options
| author | Erlang/OTP <[email protected]> | 2018-06-13 10:40:07 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-06-13 10:40:07 +0200 |
| commit | 3229364a6c0860e6382f8a3eaa778c5907f0c47e (patch) | |
| tree | 92e46650ea87aedb087b11ad82fe9f56fdaeb47c /erts | |
| parent | cfaede58328ace4bb4fb7c5e1b055e420c0ded9a (diff) | |
| parent | 8eeb653417b839f34e9a778820fc3f18395a3d8a (diff) | |
| download | otp-3229364a6c0860e6382f8a3eaa778c5907f0c47e.tar.gz otp-3229364a6c0860e6382f8a3eaa778c5907f0c47e.tar.bz2 otp-3229364a6c0860e6382f8a3eaa778c5907f0c47e.zip | |
Merge branch 'sverker/ets-auto-unfix-delete-race/OTP-15109' into maint-20
* sverker/ets-auto-unfix-delete-race/OTP-15109:
erts: Fix race between ets table deletion and auto-unfix
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 6d4a895ef6..68d984014f 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -1948,8 +1948,6 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1) save_owned_table(BIF_P, tb); } - tid_clear(BIF_P, tb); - if (is_table_named(tb)) remove_named_tab(tb, 0); @@ -1958,6 +1956,7 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1) tb->common.heir = am_none; reds -= free_fixations_locked(BIF_P, tb); + tid_clear(BIF_P, tb); db_unlock(tb, LCK_WRITE); if (free_table_continue(BIF_P, tb, reds) < 0) { @@ -3680,7 +3679,6 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks) && give_away_to_heir(c_p, tb)) { break; } - tid_clear(c_p, tb); /* Clear all access bits. */ tb->common.status &= ~(DB_PROTECTED | DB_PUBLIC | DB_PRIVATE); tb->common.status |= DB_DELETE; @@ -3690,6 +3688,7 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks) free_heir_data(tb); reds -= free_fixations_locked(c_p, tb); + tid_clear(c_p, tb); db_unlock(tb, LCK_WRITE); state->op = FREE_OWNED_TABLE; break; @@ -3850,7 +3849,7 @@ static void free_fixations_op(DbFixation* fix, void* vctx) struct free_fixations_ctx* ctx = (struct free_fixations_ctx*) vctx; erts_aint_t diff; - ASSERT(!btid2tab(fix->tabs.btid)); + ASSERT(btid2tab(fix->tabs.btid) == ctx->tb); ASSERT(fix->counter > 0); ASSERT(ctx->tb->common.status & DB_DELETE); |