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

mdbx: perform madvise only for the first process opens a DB.

Browse Source
This commit is contained in:
Leonid Yuriev 2021-07-16 14:40:01 +03:00
parent ba22ae9ab3
commit 7da64b725d
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core.c
View File

@ -11647,7 +11647,7 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
env->me_poison_edge = bytes2pgno(env, env->me_dxb_mmap.filesize); env->me_poison_edge = bytes2pgno(env, env->me_dxb_mmap.filesize);
#endif /* MDBX_USE_VALGRIND || __SANITIZE_ADDRESS__ */ #endif /* MDBX_USE_VALGRIND || __SANITIZE_ADDRESS__ */
//----------------------------------------- validate head & steady meta-pages //-------------------------------- validate/rollback head & steady meta-pages
if (unlikely(env->me_stuck_meta >= 0)) { if (unlikely(env->me_stuck_meta >= 0)) {
/* recovery mode */ /* recovery mode */
MDBX_meta clone; MDBX_meta clone;
@ -11761,9 +11761,9 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
mdbx_ensure(env, 0 == mdbx_meta_eq_mask(env)); mdbx_ensure(env, 0 == mdbx_meta_eq_mask(env));
} }
//---------------------------------------------------- shrink DB & update geo
const MDBX_meta *head = mdbx_meta_head(env);
if (lck_rc == /* lck exclusive */ MDBX_RESULT_TRUE) { if (lck_rc == /* lck exclusive */ MDBX_RESULT_TRUE) {
//-------------------------------------------------- shrink DB & update geo
const MDBX_meta *head = mdbx_meta_head(env);
/* re-check size after mmap */ /* re-check size after mmap */
if ((env->me_dxb_mmap.current & (env->me_os_psize - 1)) != 0 || if ((env->me_dxb_mmap.current & (env->me_os_psize - 1)) != 0 ||
env->me_dxb_mmap.current < used_bytes) { env->me_dxb_mmap.current < used_bytes) {
@ -11828,22 +11828,21 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
} }
} }
} }
}
//--------------------------------------------------- setup madvise/readahead //------------------------------------------------- setup madvise/readahead
atomic_store32(&env->me_lck->mti_discarded_tail, atomic_store32(&env->me_lck->mti_discarded_tail,
bytes2pgno(env, used_aligned2os_bytes), mo_Relaxed); bytes2pgno(env, used_aligned2os_bytes), mo_Relaxed);
#if MDBX_ENABLE_MADVISE #if MDBX_ENABLE_MADVISE
if (lck_rc && used_aligned2os_bytes < env->me_dxb_mmap.current) { if (used_aligned2os_bytes < env->me_dxb_mmap.current) {
#if defined(MADV_REMOVE) #if defined(MADV_REMOVE)
if ((env->me_flags & MDBX_WRITEMAP) != 0 && if ((env->me_flags & MDBX_WRITEMAP) != 0 &&
/* not recovery mode */ env->me_stuck_meta < 0) { /* not recovery mode */ env->me_stuck_meta < 0) {
mdbx_notice("open-MADV_%s %u..%u", "REMOVE (deallocate file space)", mdbx_notice("open-MADV_%s %u..%u", "REMOVE (deallocate file space)",
env->me_lck->mti_discarded_tail.weak, env->me_lck->mti_discarded_tail.weak,
bytes2pgno(env, env->me_dxb_mmap.current)); bytes2pgno(env, env->me_dxb_mmap.current));
err = err = madvise(env->me_map + used_aligned2os_bytes,
madvise(env->me_map + used_aligned2os_bytes, env->me_dxb_mmap.current - used_aligned2os_bytes,
env->me_dxb_mmap.current - used_aligned2os_bytes, MADV_REMOVE) MADV_REMOVE)
? ignore_enosys(errno) ? ignore_enosys(errno)
: MDBX_SUCCESS; : MDBX_SUCCESS;
if (unlikely(MDBX_IS_ERROR(err))) if (unlikely(MDBX_IS_ERROR(err)))
@ -11854,23 +11853,25 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
mdbx_notice("open-MADV_%s %u..%u", "DONTNEED", mdbx_notice("open-MADV_%s %u..%u", "DONTNEED",
env->me_lck->mti_discarded_tail.weak, env->me_lck->mti_discarded_tail.weak,
bytes2pgno(env, env->me_dxb_mmap.current)); bytes2pgno(env, env->me_dxb_mmap.current));
err = err = madvise(env->me_map + used_aligned2os_bytes,
madvise(env->me_map + used_aligned2os_bytes, env->me_dxb_mmap.current - used_aligned2os_bytes,
env->me_dxb_mmap.current - used_aligned2os_bytes, MADV_DONTNEED) MADV_DONTNEED)
? ignore_enosys(errno) ? ignore_enosys(errno)
: MDBX_SUCCESS; : MDBX_SUCCESS;
if (unlikely(MDBX_IS_ERROR(err))) if (unlikely(MDBX_IS_ERROR(err)))
return err; return err;
#elif defined(POSIX_MADV_DONTNEED) #elif defined(POSIX_MADV_DONTNEED)
err = ignore_enosys(posix_madvise( err = ignore_enosys(
env->me_map + used_aligned2os_bytes, posix_madvise(env->me_map + used_aligned2os_bytes,
env->me_dxb_mmap.current - used_aligned2os_bytes, POSIX_MADV_DONTNEED)); env->me_dxb_mmap.current - used_aligned2os_bytes,
POSIX_MADV_DONTNEED));
if (unlikely(MDBX_IS_ERROR(err))) if (unlikely(MDBX_IS_ERROR(err)))
return err; return err;
#elif defined(POSIX_FADV_DONTNEED) #elif defined(POSIX_FADV_DONTNEED)
err = ignore_enosys(posix_fadvise( err = ignore_enosys(
env->me_lazy_fd, used_aligned2os_bytes, posix_fadvise(env->me_lazy_fd, used_aligned2os_bytes,
env->me_dxb_mmap.current - used_aligned2os_bytes, POSIX_FADV_DONTNEED)); env->me_dxb_mmap.current - used_aligned2os_bytes,
POSIX_FADV_DONTNEED));
if (unlikely(MDBX_IS_ERROR(err))) if (unlikely(MDBX_IS_ERROR(err)))
return err; return err;
#endif /* MADV_DONTNEED */ #endif /* MADV_DONTNEED */
@ -11880,6 +11881,7 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
#endif /* MDBX_ENABLE_MADVISE */ #endif /* MDBX_ENABLE_MADVISE */
} /* lck exclusive, lck_rc == MDBX_RESULT_TRUE */
return rc; return rc;
} }