ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 23:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: rework RECLAIMING inside update_gc().

Browse Source 
Change-Id: I9cf592476780bfdb346472baa12497d68a3d5aad
This commit is contained in:
Leonid Yuriev 2019-06-22 18:46:41 +03:00
parent 15403aadad
commit e3f8dc5501
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mdbx.c
View File

@ -3757,6 +3757,7 @@ static int mdbx_prep_backlog(MDBX_txn *txn, MDBX_cursor *mc) {
const int extra = mdbx_backlog_extragap(txn->mt_env); const int extra = mdbx_backlog_extragap(txn->mt_env);
if (mdbx_backlog_size(txn) < mc->mc_db->md_depth + extra) { if (mdbx_backlog_size(txn) < mc->mc_db->md_depth + extra) {
mc->mc_flags &= ~C_RECLAIMING;
int rc = mdbx_cursor_touch(mc); int rc = mdbx_cursor_touch(mc);
if (unlikely(rc)) if (unlikely(rc))
return rc; return rc;
@ -3770,6 +3771,7 @@ static int mdbx_prep_backlog(MDBX_txn *txn, MDBX_cursor *mc) {
break; break;
} }
} }
mc->mc_flags |= C_RECLAIMING;
} }
return MDBX_SUCCESS; return MDBX_SUCCESS;
@ -3882,6 +3884,7 @@ static int mdbx_update_gc(MDBX_txn *txn) {
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout_notracking; goto bailout_notracking;
mc.mc_flags |= C_RECLAIMING;
mc.mc_next = txn->mt_cursors[FREE_DBI]; mc.mc_next = txn->mt_cursors[FREE_DBI];
txn->mt_cursors[FREE_DBI] = &mc; txn->mt_cursors[FREE_DBI] = &mc;
@ -3927,9 +3930,7 @@ retry:
mdbx_tassert(txn, cleaned_gc_id < *env->me_oldest); mdbx_tassert(txn, cleaned_gc_id < *env->me_oldest);
mdbx_trace("%s.cleanup-reclaimed-id [%u]%" PRIaTXN, dbg_prefix_mode, mdbx_trace("%s.cleanup-reclaimed-id [%u]%" PRIaTXN, dbg_prefix_mode,
cleaned_gc_slot, cleaned_gc_id); cleaned_gc_slot, cleaned_gc_id);
mc.mc_flags |= C_RECLAIMING;
rc = mdbx_cursor_del(&mc, 0); rc = mdbx_cursor_del(&mc, 0);
mc.mc_flags ^= C_RECLAIMING;
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
} while (cleaned_gc_slot < MDBX_PNL_SIZE(txn->mt_lifo_reclaimed)); } while (cleaned_gc_slot < MDBX_PNL_SIZE(txn->mt_lifo_reclaimed));
@ -3951,9 +3952,7 @@ retry:
mdbx_tassert(txn, cleaned_gc_id < *env->me_oldest); mdbx_tassert(txn, cleaned_gc_id < *env->me_oldest);
mdbx_trace("%s.cleanup-reclaimed-id %" PRIaTXN, dbg_prefix_mode, mdbx_trace("%s.cleanup-reclaimed-id %" PRIaTXN, dbg_prefix_mode,
cleaned_gc_id); cleaned_gc_id);
mc.mc_flags |= C_RECLAIMING;
rc = mdbx_cursor_del(&mc, 0); rc = mdbx_cursor_del(&mc, 0);
mc.mc_flags ^= C_RECLAIMING;
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
settled = 0; settled = 0;
@ -4106,7 +4105,9 @@ retry:
if (befree_stored < MDBX_PNL_SIZE(txn->mt_befree_pages)) { if (befree_stored < MDBX_PNL_SIZE(txn->mt_befree_pages)) {
if (unlikely(!befree_stored)) { if (unlikely(!befree_stored)) {
/* Make sure last page of freeDB is touched and on befree-list */ /* Make sure last page of freeDB is touched and on befree-list */
mc.mc_flags &= ~C_RECLAIMING;
rc = mdbx_page_search(&mc, NULL, MDBX_PS_LAST | MDBX_PS_MODIFY); rc = mdbx_page_search(&mc, NULL, MDBX_PS_LAST | MDBX_PS_MODIFY);
mc.mc_flags |= C_RECLAIMING;
if (unlikely(rc != MDBX_SUCCESS && rc != MDBX_NOTFOUND)) if (unlikely(rc != MDBX_SUCCESS && rc != MDBX_NOTFOUND))
goto bailout; goto bailout;
} }
@ -4200,7 +4201,9 @@ retry:
reused_gc_slot) * reused_gc_slot) *
env->me_maxgc_ov1page) { env->me_maxgc_ov1page) {
/* LY: need just a txn-id for save page list. */ /* LY: need just a txn-id for save page list. */
mc.mc_flags &= ~C_RECLAIMING;
rc = mdbx_page_alloc(&mc, 0, NULL, MDBX_ALLOC_GC | MDBX_ALLOC_KICK); rc = mdbx_page_alloc(&mc, 0, NULL, MDBX_ALLOC_GC | MDBX_ALLOC_KICK);
mc.mc_flags |= C_RECLAIMING;
if (likely(rc == MDBX_SUCCESS)) { if (likely(rc == MDBX_SUCCESS)) {
/* LY: ok, reclaimed from freedb. */ /* LY: ok, reclaimed from freedb. */
mdbx_trace("%s: took @%" PRIaTXN " from GC, continue", mdbx_trace("%s: took @%" PRIaTXN " from GC, continue",
@ -4322,9 +4325,7 @@ retry:
data.iov_len = (chunk + 1) * sizeof(pgno_t); data.iov_len = (chunk + 1) * sizeof(pgno_t);
mdbx_trace("%s.reserve: %u [%u...%u] @%" PRIaTXN, dbg_prefix_mode, chunk, mdbx_trace("%s.reserve: %u [%u...%u] @%" PRIaTXN, dbg_prefix_mode, chunk,
settled + 1, settled + chunk + 1, reservation_gc_id); settled + 1, settled + chunk + 1, reservation_gc_id);
mc.mc_flags |= C_RECLAIMING;
rc = mdbx_cursor_put(&mc, &key, &data, MDBX_RESERVE | MDBX_NOOVERWRITE); rc = mdbx_cursor_put(&mc, &key, &data, MDBX_RESERVE | MDBX_NOOVERWRITE);
mc.mc_flags -= C_RECLAIMING;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist, true)); mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist, true));
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
@ -4416,7 +4417,7 @@ retry:
key.iov_len = sizeof(fill_gc_id); key.iov_len = sizeof(fill_gc_id);
mdbx_tassert(txn, data.iov_len >= sizeof(pgno_t) * 2); mdbx_tassert(txn, data.iov_len >= sizeof(pgno_t) * 2);
mc.mc_flags |= C_RECLAIMING | C_GCFREEZE; mc.mc_flags |= C_GCFREEZE;
unsigned chunk = (unsigned)(data.iov_len / sizeof(pgno_t)) - 1; unsigned chunk = (unsigned)(data.iov_len / sizeof(pgno_t)) - 1;
if (unlikely(chunk > left)) { if (unlikely(chunk > left)) {
mdbx_trace("%s: chunk %u > left %u, @%" PRIaTXN, dbg_prefix_mode, chunk, mdbx_trace("%s: chunk %u > left %u, @%" PRIaTXN, dbg_prefix_mode, chunk,
@ -4424,12 +4425,12 @@ retry:
if (loop < 5 || chunk - left > env->me_maxgc_ov1page) { if (loop < 5 || chunk - left > env->me_maxgc_ov1page) {
data.iov_len = (left + 1) * sizeof(pgno_t); data.iov_len = (left + 1) * sizeof(pgno_t);
if (loop < 21) if (loop < 21)
mc.mc_flags -= C_GCFREEZE; mc.mc_flags &= ~C_GCFREEZE;
} }
chunk = left; chunk = left;
} }
rc = mdbx_cursor_put(&mc, &key, &data, MDBX_CURRENT | MDBX_RESERVE); rc = mdbx_cursor_put(&mc, &key, &data, MDBX_CURRENT | MDBX_RESERVE);
mc.mc_flags &= ~(C_RECLAIMING | C_GCFREEZE); mc.mc_flags &= ~C_GCFREEZE;
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;