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

mdbx: provide refunding pages into unallocated space.

Browse Source 
Change-Id: I9d4f953adc6f3b745a9822044f3933adba4ca6fe
This commit is contained in:
Leo Yuriev 2017-07-26 09:32:00 +03:00
parent dcc179f412
commit c49d1bc97a
1 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/mdbx.c
View File

@ -1678,6 +1678,7 @@ static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp,
txn->mt_loose_count--; txn->mt_loose_count--;
mdbx_debug("db %d use loose page %" PRIaPGNO, DDBI(mc), np->mp_pgno); mdbx_debug("db %d use loose page %" PRIaPGNO, DDBI(mc), np->mp_pgno);
ASAN_UNPOISON_MEMORY_REGION(np, env->me_psize); ASAN_UNPOISON_MEMORY_REGION(np, env->me_psize);
mdbx_tassert(txn, np->mp_pgno < txn->mt_next_pgno);
*mp = np; *mp = np;
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -1850,18 +1851,44 @@ static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp,
/* Merge in descending sorted order */ /* Merge in descending sorted order */
mdbx_pnl_xmerge(repg_list, re_pnl); mdbx_pnl_xmerge(repg_list, re_pnl);
repg_len = repg_list[0]; repg_len = repg_list[0];
if (unlikely((flags & MDBX_ALLOC_CACHE) == 0)) { if (unlikely((flags & MDBX_ALLOC_CACHE) == 0)) {
/* Done for a kick-reclaim mode, actually no page needed */ /* Done for a kick-reclaim mode, actually no page needed */
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
/* Return suitable pages into "unallocated" pull */ /* Refund suitable pages into "unallocated" pull */
while (repg_len > wanna_range && mdbx_tassert(txn,
repg_list[repg_len] == txn->mt_next_pgno - 1) { repg_len == 0 || repg_list[repg_len] < txn->mt_next_pgno);
txn->mt_next_pgno -= 1; if (repg_len) {
repg_len -= 1; /* Refund suitable pages into "unallocated" pull */
repg_list[0] = repg_len; pgno_t tail = txn->mt_next_pgno;
pgno_t *const begin = repg_list + 1;
pgno_t *const end = begin + repg_len;
pgno_t *higest;
#if MDBX_PNL_ASCENDING
for (higest = end; --higest >= begin;) {
#else
for (higest = begin; higest < end; ++higest) {
#endif /* MDBX_PNL sort-order */
mdbx_tassert(txn, *higest >= NUM_METAS && *higest < tail);
if (*higest != tail - 1)
break;
tail -= 1;
}
if (tail != txn->mt_next_pgno) {
#if MDBX_PNL_ASCENDING
repg_len = higest + 1 - begin;
#else
repg_len -= higest - begin;
for (pgno_t *move = begin; higest < end; ++move, ++higest)
*move = *higest;
#endif /* MDBX_PNL sort-order */
repg_list[0] = repg_len;
mdbx_info("refunded %" PRIaPGNO " pages: %" PRIaPGNO " -> %" PRIaPGNO,
tail - txn->mt_next_pgno, tail, txn->mt_next_pgno);
txn->mt_next_pgno = tail;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
}
} }
/* Don't try to coalesce too much. */ /* Don't try to coalesce too much. */
@ -1994,6 +2021,8 @@ done:
} }
if (repg_pos) { if (repg_pos) {
mdbx_tassert(txn, pgno < txn->mt_next_pgno);
mdbx_tassert(txn, pgno == repg_list[repg_pos]);
/* Cutoff allocated pages from me_reclaimed_pglist */ /* Cutoff allocated pages from me_reclaimed_pglist */
repg_list[0] = repg_len -= num; repg_list[0] = repg_len -= num;
for (unsigned i = repg_pos - num; i < repg_len;) for (unsigned i = repg_pos - num; i < repg_len;)
@ -3034,6 +3063,38 @@ again_on_freelist_change:
txn->mt_loose_count = 0; txn->mt_loose_count = 0;
} }
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
if (env->me_reclaimed_pglist) {
/* Refund suitable pages into "unallocated" pull */
pgno_t tail = txn->mt_next_pgno;
pgno_t *const begin = env->me_reclaimed_pglist + 1;
pgno_t *const end = begin + env->me_reclaimed_pglist[0];
pgno_t *higest;
#if MDBX_PNL_ASCENDING
for (higest = end; --higest >= begin;) {
#else
for (higest = begin; higest < end; ++higest) {
#endif /* MDBX_PNL sort-order */
mdbx_tassert(txn, *higest >= NUM_METAS && *higest < tail);
if (*higest != tail - 1)
break;
tail -= 1;
}
if (tail != txn->mt_next_pgno) {
#if MDBX_PNL_ASCENDING
env->me_reclaimed_pglist[0] = higest + 1 - begin;
#else
env->me_reclaimed_pglist[0] -= higest - begin;
for (pgno_t *move = begin; higest < end; ++move, ++higest)
*move = *higest;
#endif /* MDBX_PNL sort-order */
mdbx_info("refunded %" PRIaPGNO " pages: %" PRIaPGNO " -> %" PRIaPGNO,
tail - txn->mt_next_pgno, tail, txn->mt_next_pgno);
txn->mt_next_pgno = tail;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
}
}
/* Save the PNL of pages freed by this txn, to a single record */ /* Save the PNL of pages freed by this txn, to a single record */
if (befree_count < txn->mt_befree_pages[0]) { if (befree_count < txn->mt_befree_pages[0]) {
if (unlikely(!befree_count)) { if (unlikely(!befree_count)) {