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

mdbx: refine mdbx_wipe_steady().

Browse Source
This commit is contained in:
Leonid Yuriev 2021-05-12 13:53:53 +03:00
parent 5731ad11c8
commit 7d8099fc77
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/core.c
View File

@ -6119,7 +6119,7 @@ static __cold int mdbx_mapresize_implicit(MDBX_env *env, const pgno_t used_pgno,
} }
static int mdbx_meta_unsteady(MDBX_env *env, const txnid_t last_steady, static int mdbx_meta_unsteady(MDBX_env *env, const txnid_t last_steady,
MDBX_meta *const meta) { MDBX_meta *const meta, mdbx_filehandle_t fd) {
const uint64_t wipe = MDBX_DATASIGN_NONE; const uint64_t wipe = MDBX_DATASIGN_NONE;
if (unlikely(META_IS_STEADY(meta)) && if (unlikely(META_IS_STEADY(meta)) &&
mdbx_meta_txnid_stable(env, meta) <= last_steady) { mdbx_meta_txnid_stable(env, meta) <= last_steady) {
@ -6127,25 +6127,27 @@ static int mdbx_meta_unsteady(MDBX_env *env, const txnid_t last_steady,
data_page(meta)->mp_pgno); data_page(meta)->mp_pgno);
if (env->me_flags & MDBX_WRITEMAP) if (env->me_flags & MDBX_WRITEMAP)
unaligned_poke_u64(4, meta->mm_datasync_sign, wipe); unaligned_poke_u64(4, meta->mm_datasync_sign, wipe);
else { else
#if MDBX_ENABLE_PGOP_STAT return mdbx_pwrite(fd, &wipe, sizeof(meta->mm_datasync_sign),
safe64_inc(&env->me_lck->mti_pgop_stat.wops, 1);
#endif /* MDBX_ENABLE_PGOP_STAT */
return mdbx_pwrite(env->me_lazy_fd, &wipe, sizeof(meta->mm_datasync_sign),
(uint8_t *)&meta->mm_datasync_sign - env->me_map); (uint8_t *)&meta->mm_datasync_sign - env->me_map);
} }
}
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
__cold static int mdbx_wipe_steady(MDBX_env *env, const txnid_t last_steady) { __cold static int mdbx_wipe_steady(MDBX_env *env, const txnid_t last_steady) {
int err = mdbx_meta_unsteady(env, last_steady, METAPAGE(env, 0)); #if MDBX_ENABLE_PGOP_STAT
safe64_inc(&env->me_lck->mti_pgop_stat.wops, 1);
#endif /* MDBX_ENABLE_PGOP_STAT */
const mdbx_filehandle_t fd = (env->me_dsync_fd != INVALID_HANDLE_VALUE)
? env->me_dsync_fd
: env->me_lazy_fd;
int err = mdbx_meta_unsteady(env, last_steady, METAPAGE(env, 0), fd);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
err = mdbx_meta_unsteady(env, last_steady, METAPAGE(env, 1)); err = mdbx_meta_unsteady(env, last_steady, METAPAGE(env, 1), fd);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
err = mdbx_meta_unsteady(env, last_steady, METAPAGE(env, 2)); err = mdbx_meta_unsteady(env, last_steady, METAPAGE(env, 2), fd);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
@ -6156,33 +6158,28 @@ __cold static int mdbx_wipe_steady(MDBX_env *env, const txnid_t last_steady) {
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
} else { } else {
if (fd == env->me_lazy_fd) {
#if MDBX_USE_SYNCFILERANGE #if MDBX_USE_SYNCFILERANGE
static bool syncfilerange_unavailable; static bool syncfilerange_unavailable;
if (likely(!syncfilerange_unavailable)) { if (!syncfilerange_unavailable &&
if (likely(!sync_file_range( sync_file_range(env->me_lazy_fd, 0, pgno2bytes(env, NUM_METAS),
env->me_lazy_fd, 0, pgno2bytes(env, NUM_METAS), SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_AFTER)) {
SYNC_FILE_RANGE_WRITE | SYNC_FILE_RANGE_WAIT_AFTER)))
goto done_filesync;
err = errno; err = errno;
if (ignore_enosys(err) != MDBX_RESULT_TRUE) if (ignore_enosys(err) == MDBX_RESULT_TRUE)
return err;
syncfilerange_unavailable = true; syncfilerange_unavailable = true;
} }
if (syncfilerange_unavailable)
#endif /* MDBX_USE_SYNCFILERANGE */ #endif /* MDBX_USE_SYNCFILERANGE */
err = mdbx_fsync(env->me_lazy_fd, MDBX_SYNC_DATA); err = mdbx_fsync(env->me_lazy_fd, MDBX_SYNC_DATA);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
#if MDBX_USE_SYNCFILERANGE }
done_filesync:
#endif /* MDBX_USE_SYNCFILERANGE */
mdbx_flush_incoherent_mmap(env->me_map, pgno2bytes(env, NUM_METAS), mdbx_flush_incoherent_mmap(env->me_map, pgno2bytes(env, NUM_METAS),
env->me_os_psize); env->me_os_psize);
} }
MDBX_lockinfo *const lck = env->me_lck_mmap.lck;
if (likely(lck))
/* force oldest refresh */ /* force oldest refresh */
atomic_store32(&lck->mti_readers_refresh_flag, true, mo_Relaxed); atomic_store32(&env->me_lck->mti_readers_refresh_flag, true, mo_Relaxed);
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }