diff options
| author | Sverker Eriksson <[email protected]> | 2017-09-12 20:09:31 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-09-12 20:09:31 +0200 |
| commit | c1677e8ef83416ad14faf61c61ee13cd3aebb0a4 (patch) | |
| tree | 3969fb0e3279d5e73fbb549517509e810bf4123b /erts/emulator/beam/erl_db.c | |
| parent | ef0a90d9ebf0922df027dce904fea989ce138a54 (diff) | |
| parent | dcb66b30a2115e2a57436d800ed41880e5be633e (diff) | |
| download | otp-c1677e8ef83416ad14faf61c61ee13cd3aebb0a4.tar.gz otp-c1677e8ef83416ad14faf61c61ee13cd3aebb0a4.tar.bz2 otp-c1677e8ef83416ad14faf61c61ee13cd3aebb0a4.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_db.c')
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index a21b9b9c0c..3ba0886464 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -3550,14 +3550,8 @@ static SWord proc_cleanup_fixed_table(Process* p, DbFixation* fix) ASSERT(sizeof(DbFixation) == ERTS_ALC_DBG_BLK_SZ(fix)); ERTS_DB_ALC_MEM_UPDATE_(tb, sizeof(DbFixation), 0); } - else { - ASSERT(fix->counter == 0); - } db_unlock(tb, LCK_WRITE_REC); } - else { - ASSERT(fix->counter == 0); - } erts_bin_release(fix->tabs.btid); erts_free(ERTS_ALC_T_DB_FIXATION, fix); @@ -3785,11 +3779,8 @@ static void free_fixations_op(DbFixation* fix, void* vctx) { struct free_fixations_ctx* ctx = (struct free_fixations_ctx*) vctx; erts_aint_t diff; -#ifdef DEBUG - DbTable* dbg_tb = btid2tab(fix->tabs.btid); -#endif - ASSERT(!dbg_tb || dbg_tb == ctx->tb); + ASSERT(!btid2tab(fix->tabs.btid)); ASSERT(fix->counter > 0); ASSERT(ctx->tb->common.status & DB_DELETE); |