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

mdbx: more checks for pgno-list ordering.

Browse Source 
Change-Id: I6c6093532e8d2c07c42f62d23579ef86cbbd43b7
This commit is contained in:
Leo Yuriev 2017-07-26 14:55:49 +03:00
parent b8b3ba8e91
commit dcc179f412
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mdbx.c
View File

@ -1683,6 +1683,7 @@ static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp,
} }
} }
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
pgno_t pgno, *repg_list = env->me_reclaimed_pglist; pgno_t pgno, *repg_list = env->me_reclaimed_pglist;
unsigned repg_pos = 0, repg_len = repg_list ? repg_list[0] : 0; unsigned repg_pos = 0, repg_len = repg_list ? repg_list[0] : 0;
txnid_t oldest = 0, last = 0; txnid_t oldest = 0, last = 0;
@ -1969,6 +1970,7 @@ static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp,
} }
fail: fail:
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
if (mp) { if (mp) {
*mp = NULL; *mp = NULL;
txn->mt_flags |= MDBX_TXN_ERROR; txn->mt_flags |= MDBX_TXN_ERROR;
@ -1996,6 +1998,7 @@ done:
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;)
repg_list[++i] = repg_list[++repg_pos]; repg_list[++i] = repg_list[++repg_pos];
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
} else { } else {
txn->mt_next_pgno = pgno + num; txn->mt_next_pgno = pgno + num;
mdbx_assert(env, txn->mt_next_pgno <= txn->mt_end_pgno); mdbx_assert(env, txn->mt_next_pgno <= txn->mt_end_pgno);
@ -2012,6 +2015,7 @@ done:
mdbx_page_dirty(txn, np); mdbx_page_dirty(txn, np);
*mp = np; *mp = np;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -2945,11 +2949,14 @@ static int mdbx_freelist_save(MDBX_txn *txn) {
(env->me_flags & (MDBX_NOMEMINIT | MDBX_WRITEMAP)) ? SSIZE_MAX (env->me_flags & (MDBX_NOMEMINIT | MDBX_WRITEMAP)) ? SSIZE_MAX
: env->me_maxfree_1pg; : env->me_maxfree_1pg;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
again_on_freelist_change: again_on_freelist_change:
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
while (1) { while (1) {
/* Come back here after each Put() in case freelist changed */ /* Come back here after each Put() in case freelist changed */
MDBX_val key, data; MDBX_val key, data;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
if (!lifo) { if (!lifo) {
/* If using records from freeDB which we have not yet deleted, /* If using records from freeDB which we have not yet deleted,
* now delete them and any we reserved for me_reclaimed_pglist. */ * now delete them and any we reserved for me_reclaimed_pglist. */
@ -2992,6 +2999,7 @@ again_on_freelist_change:
} }
} }
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
if (txn->mt_loose_pages) { if (txn->mt_loose_pages) {
/* Return loose page numbers to me_reclaimed_pglist, /* Return loose page numbers to me_reclaimed_pglist,
* though usually none are left at this point. * though usually none are left at this point.
@ -3063,6 +3071,7 @@ again_on_freelist_change:
continue; continue;
} }
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
const intptr_t rpl_len = const intptr_t rpl_len =
(env->me_reclaimed_pglist ? env->me_reclaimed_pglist[0] : 0) + (env->me_reclaimed_pglist ? env->me_reclaimed_pglist[0] : 0) +
txn->mt_loose_count; txn->mt_loose_count;
@ -3140,6 +3149,7 @@ again_on_freelist_change:
key.iov_base = &head_id; key.iov_base = &head_id;
data.iov_len = (head_room + 1) * sizeof(pgno_t); data.iov_len = (head_room + 1) * sizeof(pgno_t);
rc = mdbx_cursor_put(&mc, &key, &data, MDBX_RESERVE); rc = mdbx_cursor_put(&mc, &key, &data, MDBX_RESERVE);
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
if (unlikely(rc)) if (unlikely(rc))
goto bailout; goto bailout;
@ -3159,6 +3169,7 @@ again_on_freelist_change:
/* Fill in the reserved me_reclaimed_pglist records */ /* Fill in the reserved me_reclaimed_pglist records */
rc = MDBX_SUCCESS; rc = MDBX_SUCCESS;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist));
if (env->me_reclaimed_pglist && env->me_reclaimed_pglist[0]) { if (env->me_reclaimed_pglist && env->me_reclaimed_pglist[0]) {
MDBX_val key, data; MDBX_val key, data;
key.iov_len = data.iov_len = 0; /* avoid MSVC warning */ key.iov_len = data.iov_len = 0; /* avoid MSVC warning */