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

mdbx: fix reclaimed-list allocation during nested txn start.

Browse Source 
Change-Id: Ia70e01ed69a001249ce14b4930452a469d04b824
This commit is contained in:
Leonid Yuriev 2021-01-23 23:46:55 +03:00
parent 4e13d1239a
commit 95ae324580
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -6943,8 +6943,10 @@ int mdbx_txn_begin_ex(MDBX_env *env, MDBX_txn *parent, MDBX_txn_flags_t flags,
txn->mt_dbiseqs = parent->mt_dbiseqs; txn->mt_dbiseqs = parent->mt_dbiseqs;
rc = mdbx_dpl_alloc(txn); rc = mdbx_dpl_alloc(txn);
if (likely(rc == MDBX_SUCCESS)) { if (likely(rc == MDBX_SUCCESS)) {
const unsigned len =
MDBX_PNL_SIZE(parent->tw.reclaimed_pglist) + parent->tw.loose_count;
txn->tw.reclaimed_pglist = txn->tw.reclaimed_pglist =
mdbx_pnl_alloc(MDBX_PNL_ALLOCLEN(parent->tw.reclaimed_pglist)); mdbx_pnl_alloc((len > MDBX_PNL_INITIAL) ? len : MDBX_PNL_INITIAL);
if (unlikely(!txn->tw.reclaimed_pglist)) if (unlikely(!txn->tw.reclaimed_pglist))
rc = MDBX_ENOMEM; rc = MDBX_ENOMEM;
} }
@ -6983,6 +6985,8 @@ int mdbx_txn_begin_ex(MDBX_env *env, MDBX_txn *parent, MDBX_txn_flags_t flags,
if (parent->tw.spill_pages) if (parent->tw.spill_pages)
mdbx_spill_purge(parent); mdbx_spill_purge(parent);
mdbx_tassert(txn, MDBX_PNL_ALLOCLEN(txn->tw.reclaimed_pglist) >=
MDBX_PNL_SIZE(parent->tw.reclaimed_pglist));
memcpy(txn->tw.reclaimed_pglist, parent->tw.reclaimed_pglist, memcpy(txn->tw.reclaimed_pglist, parent->tw.reclaimed_pglist,
MDBX_PNL_SIZEOF(parent->tw.reclaimed_pglist)); MDBX_PNL_SIZEOF(parent->tw.reclaimed_pglist));
mdbx_assert(env, mdbx_pnl_check4assert( mdbx_assert(env, mdbx_pnl_check4assert(