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

mdbx: rework mdbx_dpage_free(), drop mdbx_page_free().

Browse Source 
Change-Id: Ida58003b355fe0271a835a50c78b930c73806e87
This commit is contained in:
Leonid Yuriev 2018-09-10 22:23:32 +03:00 committed by Leo Yuriev
parent f22c0856bf
commit 94aa20febc
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mdbx.c
View File

@ -1475,22 +1475,15 @@ static MDBX_page *mdbx_page_malloc(MDBX_txn *txn, unsigned num) {
return np; return np;
} }
/* Free a single page.
* Saves single pages to a list, for future reuse.
* (This is not used for multi-page overflow pages.) */
static __inline void mdbx_page_free(MDBX_env *env, MDBX_page *mp) {
#if MDBX_DEBUG
mp->mp_pgno = MAX_PAGENO;
#endif
mp->mp_next = env->me_dpages;
VALGRIND_MEMPOOL_FREE(env, mp);
env->me_dpages = mp;
}
/* Free a dirty page */ /* Free a dirty page */
static void mdbx_dpage_free(MDBX_env *env, MDBX_page *dp) { static void mdbx_dpage_free(MDBX_env *env, MDBX_page *dp, unsigned pages) {
if (!IS_OVERFLOW(dp) || dp->mp_pages == 1) { #if MDBX_DEBUG
mdbx_page_free(env, dp); dp->mp_pgno = MAX_PAGENO;
#endif
if (pages == 1) {
dp->mp_next = env->me_dpages;
VALGRIND_MEMPOOL_FREE(env, dp);
env->me_dpages = dp;
} else { } else {
/* large pages just get freed directly */ /* large pages just get freed directly */
VALGRIND_MEMPOOL_FREE(env, dp); VALGRIND_MEMPOOL_FREE(env, dp);
@ -1504,8 +1497,10 @@ static void mdbx_dlist_free(MDBX_txn *txn) {
MDBX_DPL dl = txn->mt_rw_dirtylist; MDBX_DPL dl = txn->mt_rw_dirtylist;
size_t i, n = dl->length; size_t i, n = dl->length;
for (i = 1; i <= n; i++) for (i = 1; i <= n; i++) {
mdbx_dpage_free(env, dl[i].ptr); MDBX_page *dp = dl[i].ptr;
mdbx_dpage_free(env, dp, IS_OVERFLOW(dp) ? dp->mp_pages : 1);
}
dl->length = 0; dl->length = 0;
} }
@ -2771,7 +2766,7 @@ static int mdbx_page_touch(MDBX_cursor *mc) {
} }
rc = mdbx_dpl_insert(dl, pgno, np); rc = mdbx_dpl_insert(dl, pgno, np);
if (unlikely(rc)) { if (unlikely(rc)) {
mdbx_dpage_free(txn->mt_env, np); mdbx_dpage_free(txn->mt_env, np, 1);
goto fail; goto fail;
} }
} else { } else {
@ -3833,7 +3828,7 @@ retry:
MDBX_page *dp = mp; MDBX_page *dp = mp;
mp = NEXT_LOOSE_PAGE(mp); mp = NEXT_LOOSE_PAGE(mp);
if ((env->me_flags & MDBX_WRITEMAP) == 0) if ((env->me_flags & MDBX_WRITEMAP) == 0)
mdbx_dpage_free(env, dp); mdbx_dpage_free(env, dp, 1);
} }
if (left > 0) { if (left > 0) {
@ -4350,7 +4345,7 @@ static int mdbx_page_flush(MDBX_txn *txn, pgno_t keep) {
dl[j].pgno = dp->mp_pgno; dl[j].pgno = dp->mp_pgno;
continue; continue;
} }
mdbx_dpage_free(env, dp); mdbx_dpage_free(env, dp, IS_OVERFLOW(dp) ? dp->mp_pages : 1);
} }
done: done:
@ -7031,7 +7026,7 @@ static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) {
} }
txn->mt_dirtyroom++; txn->mt_dirtyroom++;
if (!(env->me_flags & MDBX_WRITEMAP)) if (!(env->me_flags & MDBX_WRITEMAP))
mdbx_dpage_free(env, mp); mdbx_dpage_free(env, mp, IS_OVERFLOW(mp) ? mp->mp_pages : 1);
release: release:
/* Insert in me_reclaimed_pglist */ /* Insert in me_reclaimed_pglist */
mop = env->me_reclaimed_pglist; mop = env->me_reclaimed_pglist;
@ -8260,7 +8255,7 @@ int mdbx_cursor_put(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
rc2 = mdbx_dpl_insert(mc->mc_txn->mt_rw_dirtylist, pg, np); rc2 = mdbx_dpl_insert(mc->mc_txn->mt_rw_dirtylist, pg, np);
if (unlikely(rc2 != MDBX_SUCCESS)) { if (unlikely(rc2 != MDBX_SUCCESS)) {
rc = rc2; rc = rc2;
mdbx_dpage_free(env, np); mdbx_dpage_free(env, np, ovpages);
goto fail; goto fail;
} }
@ -10838,7 +10833,7 @@ static int mdbx_page_split(MDBX_cursor *mc, const MDBX_val *newkey,
done: done:
if (copy) /* tmp page */ if (copy) /* tmp page */
mdbx_page_free(env, copy); mdbx_dpage_free(env, copy, 1);
if (unlikely(rc)) if (unlikely(rc))
mc->mc_txn->mt_flags |= MDBX_TXN_ERROR; mc->mc_txn->mt_flags |= MDBX_TXN_ERROR;
return rc; return rc;