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

mdbx: drop NEXT_LOOSE_PAGE macro.

Browse Source 
Change-Id: Icee989a7bcd89a5fcd2664c6a9a99cdc546cc8f1
This commit is contained in:
Leonid Yuriev 2019-10-10 23:12:16 +03:00
parent 39c1238d8e
commit 3c4d87520e
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/elements/core.c
View File

@ -2126,9 +2126,9 @@ static __must_check_result int mdbx_refund_loose(MDBX_txn *txn) {
for (MDBX_page **link = &txn->tw.loose_pages; *link;) { for (MDBX_page **link = &txn->tw.loose_pages; *link;) {
MDBX_page *mp = *link; MDBX_page *mp = *link;
if (likely(txn->mt_next_pgno != mp->mp_pgno + 1)) { if (likely(txn->mt_next_pgno != mp->mp_pgno + 1)) {
link = &NEXT_LOOSE_PAGE(*link); link = &(*link)->mp_next;
} else { } else {
*link = NEXT_LOOSE_PAGE(mp); *link = mp->mp_next;
mdbx_verbose("refund loose-page: %" PRIaPGNO " -> %" PRIaPGNO, mdbx_verbose("refund loose-page: %" PRIaPGNO " -> %" PRIaPGNO,
txn->mt_next_pgno, mp->mp_pgno); txn->mt_next_pgno, mp->mp_pgno);
txn->mt_next_pgno = mp->mp_pgno; txn->mt_next_pgno = mp->mp_pgno;
@ -2215,9 +2215,8 @@ static __must_check_result int mdbx_page_loose(MDBX_cursor *mc, MDBX_page *mp) {
VALGRIND_MAKE_MEM_DEFINED(&mp->mp_pgno, sizeof(mp->mp_pgno)); VALGRIND_MAKE_MEM_DEFINED(&mp->mp_pgno, sizeof(mp->mp_pgno));
if (unlikely(txn->mt_env->me_flags & MDBX_PAGEPERTURB)) if (unlikely(txn->mt_env->me_flags & MDBX_PAGEPERTURB))
mdbx_kill_page(txn->mt_env, mp); mdbx_kill_page(txn->mt_env, mp);
MDBX_page **link = &NEXT_LOOSE_PAGE(mp);
mp->mp_flags = P_LOOSE | P_DIRTY; mp->mp_flags = P_LOOSE | P_DIRTY;
*link = txn->tw.loose_pages; mp->mp_next = txn->tw.loose_pages;
txn->tw.loose_pages = mp; txn->tw.loose_pages = mp;
txn->tw.loose_count++; txn->tw.loose_count++;
int rc = mdbx_refund_loose(txn); int rc = mdbx_refund_loose(txn);
@ -2892,7 +2891,7 @@ static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp,
mdbx_assert(env, mp && num); mdbx_assert(env, mp && num);
if (likely(num == 1 && txn->tw.loose_pages)) { if (likely(num == 1 && txn->tw.loose_pages)) {
np = txn->tw.loose_pages; np = txn->tw.loose_pages;
txn->tw.loose_pages = NEXT_LOOSE_PAGE(np); txn->tw.loose_pages = np->mp_next;
txn->tw.loose_count--; txn->tw.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);
@ -4832,8 +4831,7 @@ retry:
if (unlikely((rc = mdbx_pnl_need(&txn->tw.retired_pages, if (unlikely((rc = mdbx_pnl_need(&txn->tw.retired_pages,
txn->tw.loose_count)) != 0)) txn->tw.loose_count)) != 0))
goto bailout; goto bailout;
for (MDBX_page *mp = txn->tw.loose_pages; mp; for (MDBX_page *mp = txn->tw.loose_pages; mp; mp = mp->mp_next)
mp = NEXT_LOOSE_PAGE(mp))
mdbx_pnl_xappend(txn->tw.retired_pages, mp->mp_pgno); mdbx_pnl_xappend(txn->tw.retired_pages, mp->mp_pgno);
mdbx_trace("%s: append %u loose-pages to retired-pages", mdbx_trace("%s: append %u loose-pages to retired-pages",
dbg_prefix_mode, txn->tw.loose_count); dbg_prefix_mode, txn->tw.loose_count);
@ -4848,7 +4846,7 @@ retry:
MDBX_PNL_ALLOCLEN(txn->tw.reclaimed_pglist) - MDBX_PNL_ALLOCLEN(txn->tw.reclaimed_pglist) -
txn->tw.loose_count - 1; txn->tw.loose_count - 1;
unsigned count = 0; unsigned count = 0;
for (MDBX_page *mp = txn->tw.loose_pages; mp; mp = NEXT_LOOSE_PAGE(mp)) for (MDBX_page *mp = txn->tw.loose_pages; mp; mp = mp->mp_next)
loose[++count] = mp->mp_pgno; loose[++count] = mp->mp_pgno;
MDBX_PNL_SIZE(loose) = count; MDBX_PNL_SIZE(loose) = count;
mdbx_pnl_sort(loose); mdbx_pnl_sort(loose);
@ -4868,7 +4866,7 @@ retry:
left -= mdbx_dpl_mark4removal(dl, mp); left -= mdbx_dpl_mark4removal(dl, mp);
MDBX_page *dp = mp; MDBX_page *dp = mp;
mp = NEXT_LOOSE_PAGE(mp); mp = mp->mp_next;
if ((env->me_flags & MDBX_WRITEMAP) == 0) if ((env->me_flags & MDBX_WRITEMAP) == 0)
mdbx_dpage_free(env, dp, 1); mdbx_dpage_free(env, dp, 1);
} }
@ -5683,7 +5681,7 @@ int mdbx_txn_commit(MDBX_txn *txn) {
/* Append our loose page list to parent's */ /* Append our loose page list to parent's */
MDBX_page **lp = &parent->tw.loose_pages; MDBX_page **lp = &parent->tw.loose_pages;
while (*lp) while (*lp)
lp = &NEXT_LOOSE_PAGE(*lp); lp = &(*lp)->mp_next;
*lp = txn->tw.loose_pages; *lp = txn->tw.loose_pages;
parent->tw.loose_count += txn->tw.loose_count; parent->tw.loose_count += txn->tw.loose_count;

7
src/elements/internals.h
View File

@ -399,8 +399,7 @@ typedef struct MDBX_meta {
* in the snapshot: Either used by a database or listed in a freeDB record. */ * in the snapshot: Either used by a database or listed in a freeDB record. */
typedef struct MDBX_page { typedef struct MDBX_page {
union { union {
struct MDBX_page *mp_next; /* for in-memory list of freed pages, struct MDBX_page *mp_next; /* for in-memory list of freed pages */
* must be first field, see NEXT_LOOSE_PAGE */
uint64_t mp_validator; /* checksum of page content or a txnid during uint64_t mp_validator; /* checksum of page content or a txnid during
* which the page has been updated */ * which the page has been updated */
}; };
@ -1228,10 +1227,6 @@ MDBX_INTERNAL_FUNC void mdbx_rthc_thread_dtor(void *ptr);
/* The number of overflow pages needed to store the given size. */ /* The number of overflow pages needed to store the given size. */
#define OVPAGES(env, size) (bytes2pgno(env, PAGEHDRSZ - 1 + (size)) + 1) #define OVPAGES(env, size) (bytes2pgno(env, PAGEHDRSZ - 1 + (size)) + 1)
/* Link in MDBX_txn.tw.loose_pages list.
* Kept outside the page header, which is needed when reusing the page. */
#define NEXT_LOOSE_PAGE(p) (*(MDBX_page **)((p) + 2))
/* Header for a single key/data pair within a page. /* Header for a single key/data pair within a page.
* Used in pages of type P_BRANCH and P_LEAF without P_LEAF2. * Used in pages of type P_BRANCH and P_LEAF without P_LEAF2.
* We guarantee 2-byte alignment for 'MDBX_node's. * We guarantee 2-byte alignment for 'MDBX_node's.