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

mdbx: fix mdb_kill_page() for MDB_PAGEPERTURB.

Browse Source 
This should fix https://github.com/ReOpen/ReOpenLDAP/issues/73

Change-Id: I9514ae76ca3b56063ba345e9d06caed7ec2c1439
This commit is contained in:
Leo Yuriev
2016-03-17 11:27:03 +03:00
parent e90613a98c
commit 6a0c1c47a6
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mdb.c
View File

@@ -1572,22 +1572,21 @@ mdb_dlist_free(MDB_txn *txn)
} }
static void __cold static void __cold
mdb_kill_page(MDB_env *env, MDB_page *mp) mdb_kill_page(MDB_env *env, pgno_t pgno)
{ {
const unsigned off = offsetof(MDB_page, mp_pb); const size_t offs = env->me_psize * pgno;
const size_t shift = offsetof(MDB_page, mp_pb);
if (env->me_flags & MDB_WRITEMAP) { if (env->me_flags & MDB_WRITEMAP) {
memset(&mp->mp_pb, 0x6F /* 'o', 111 */, env->me_psize - off); MDB_page *mp = (MDB_page *)(env->me_map + offs);
memset(&mp->mp_pb, 0x6F /* 'o', 111 */, env->me_psize - shift);
VALGRIND_MAKE_MEM_NOACCESS(&mp->mp_pb, env->me_psize - shift);
} else { } else {
if (unlikely(env->me_dpages == 0)) {
mdb_page_free(env, mdb_page_malloc(env->me_txn0, 1));
assert(env->me_dpages != 0);
}
struct iovec iov[1]; struct iovec iov[1];
iov[0].iov_len = env->me_psize - off; iov[0].iov_len = env->me_psize - shift;
iov[0].iov_base = ((char*) env->me_dpages) + off; iov[0].iov_base = alloca(iov[0].iov_len);
memset(iov[0].iov_base, 0x6F /* 'o', 111 */, iov[0].iov_len); memset(iov[0].iov_base, 0x6F /* 'o', 111 */, iov[0].iov_len);
int rc = pwritev(env->me_fd, iov, 1, env->me_psize * mp->mp_pgno + off); int rc = pwritev(env->me_fd, iov, 1, offs + shift);
assert(rc == iov[0].iov_len); assert(rc == iov[0].iov_len);
(void) rc; (void) rc;
} }
@@ -1610,10 +1609,6 @@ mdb_page_loose(MDB_cursor *mc, MDB_page *mp)
pgno_t pgno = mp->mp_pgno; pgno_t pgno = mp->mp_pgno;
MDB_txn *txn = mc->mc_txn; MDB_txn *txn = mc->mc_txn;
if (unlikely(txn->mt_env->me_flags & MDB_PAGEPERTURB)) {
mdb_kill_page(txn->mt_env, mp);
}
if ((mp->mp_flags & P_DIRTY) && mc->mc_dbi != FREE_DBI) { if ((mp->mp_flags & P_DIRTY) && mc->mc_dbi != FREE_DBI) {
if (txn->mt_parent) { if (txn->mt_parent) {
MDB_ID2 *dl = txn->mt_u.dirty_list; MDB_ID2 *dl = txn->mt_u.dirty_list;
@@ -1639,6 +1634,8 @@ mdb_page_loose(MDB_cursor *mc, MDB_page *mp)
} }
if (loose) { if (loose) {
mdb_debug("loosen db %d page %zu", DDBI(mc), mp->mp_pgno); mdb_debug("loosen db %d page %zu", DDBI(mc), mp->mp_pgno);
if (unlikely(txn->mt_env->me_flags & MDB_PAGEPERTURB))
mdb_kill_page(txn->mt_env, pgno);
NEXT_LOOSE_PAGE(mp) = txn->mt_loose_pgs; NEXT_LOOSE_PAGE(mp) = txn->mt_loose_pgs;
txn->mt_loose_pgs = mp; txn->mt_loose_pgs = mp;
txn->mt_loose_count++; txn->mt_loose_count++;
@@ -2349,6 +2346,8 @@ done:
assert(mp && num); assert(mp && num);
if (env->me_flags & MDB_WRITEMAP) { if (env->me_flags & MDB_WRITEMAP) {
np = (MDB_page *)(env->me_map + env->me_psize * pgno); np = (MDB_page *)(env->me_map + env->me_psize * pgno);
/* LY: reset no-access flag from mdb_kill_page() */
VALGRIND_MAKE_MEM_UNDEFINED(np, env->me_psize * num);
} else { } else {
if (unlikely(!(np = mdb_page_malloc(txn, num)))) { if (unlikely(!(np = mdb_page_malloc(txn, num)))) {
rc = ENOMEM; rc = ENOMEM;