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

mdbx: внутреннее переименование MDBX_SYNC_KICK (косметика).

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-12-02 19:50:31 +03:00
parent 9f2d30c1a9
commit 822952ef01
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core.c
View File

@ -1681,7 +1681,7 @@ __cold static int uniq_check(const osal_mmap_t *pending, MDBX_env **found) {
err = uniq_poke(pending, &scan->me_lck_mmap, &salt); err = uniq_poke(pending, &scan->me_lck_mmap, &salt);
if (err == MDBX_RESULT_TRUE) { if (err == MDBX_RESULT_TRUE) {
(void)osal_msync(&scan->me_lck_mmap, 0, sizeof(MDBX_lockinfo), (void)osal_msync(&scan->me_lck_mmap, 0, sizeof(MDBX_lockinfo),
MDBX_SYNC_NONE); MDBX_SYNC_KICK);
err = uniq_poke(pending, &scan->me_lck_mmap, &salt); err = uniq_poke(pending, &scan->me_lck_mmap, &salt);
} }
if (err == MDBX_RESULT_TRUE) { if (err == MDBX_RESULT_TRUE) {
@ -4813,7 +4813,7 @@ __cold static int txn_spill_slowpath(MDBX_txn *const txn, MDBX_cursor *const m0,
const MDBX_env *env = txn->mt_env; const MDBX_env *env = txn->mt_env;
rc = rc =
osal_msync(&txn->mt_env->me_dxb_mmap, 0, osal_msync(&txn->mt_env->me_dxb_mmap, 0,
pgno_align2os_bytes(env, txn->mt_next_pgno), MDBX_SYNC_NONE); pgno_align2os_bytes(env, txn->mt_next_pgno), MDBX_SYNC_KICK);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
dpl_clear(txn->tw.dirtylist); dpl_clear(txn->tw.dirtylist);
@ -5920,7 +5920,7 @@ __cold static int map_resize(MDBX_env *env, const pgno_t used_pgno,
env->me_lck->mti_pgop_stat.msync.weak += 1; env->me_lck->mti_pgop_stat.msync.weak += 1;
#endif /* MDBX_ENABLE_PGOP_STAT */ #endif /* MDBX_ENABLE_PGOP_STAT */
rc = osal_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, used_pgno), rc = osal_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, used_pgno),
MDBX_SYNC_NONE); MDBX_SYNC_KICK);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
} }
@ -11978,7 +11978,7 @@ static int sync_locked(MDBX_env *env, unsigned flags, MDBX_meta *const pending,
rc = MDBX_RESULT_FALSE /* carry steady */; rc = MDBX_RESULT_FALSE /* carry steady */;
if (atomic_load64(&env->me_lck->mti_unsynced_pages, mo_Relaxed)) { if (atomic_load64(&env->me_lck->mti_unsynced_pages, mo_Relaxed)) {
eASSERT(env, ((flags ^ env->me_flags) & MDBX_WRITEMAP) == 0); eASSERT(env, ((flags ^ env->me_flags) & MDBX_WRITEMAP) == 0);
enum osal_syncmode_bits mode_bits = MDBX_SYNC_NONE; enum osal_syncmode_bits mode_bits = MDBX_SYNC_KICK;
unsigned sync_op = 0; unsigned sync_op = 0;
if ((flags & MDBX_SAFE_NOSYNC) == 0) { if ((flags & MDBX_SAFE_NOSYNC) == 0) {
sync_op = 1; sync_op = 1;
@ -12129,7 +12129,7 @@ static int sync_locked(MDBX_env *env, unsigned flags, MDBX_meta *const pending,
#endif /* MDBX_ENABLE_PGOP_STAT */ #endif /* MDBX_ENABLE_PGOP_STAT */
rc = osal_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, NUM_METAS), rc = osal_msync(&env->me_dxb_mmap, 0, pgno_align2os_bytes(env, NUM_METAS),
(flags & MDBX_NOMETASYNC) (flags & MDBX_NOMETASYNC)
? MDBX_SYNC_NONE ? MDBX_SYNC_KICK
: MDBX_SYNC_DATA | MDBX_SYNC_IODQ); : MDBX_SYNC_DATA | MDBX_SYNC_IODQ);
} else { } else {
#if MDBX_ENABLE_PGOP_STAT #if MDBX_ENABLE_PGOP_STAT
@ -13533,7 +13533,7 @@ __cold static int setup_lck(MDBX_env *env, pathchar_t *lck_pathname,
#if MDBX_ENABLE_PGOP_STAT #if MDBX_ENABLE_PGOP_STAT
lck->mti_pgop_stat.wops.weak = 1; lck->mti_pgop_stat.wops.weak = 1;
#endif /* MDBX_ENABLE_PGOP_STAT */ #endif /* MDBX_ENABLE_PGOP_STAT */
err = osal_msync(&env->me_lck_mmap, 0, (size_t)size, MDBX_SYNC_NONE); err = osal_msync(&env->me_lck_mmap, 0, (size_t)size, MDBX_SYNC_KICK);
if (unlikely(err != MDBX_SUCCESS)) { if (unlikely(err != MDBX_SUCCESS)) {
ERROR("initial-%s for lck-file failed", "msync"); ERROR("initial-%s for lck-file failed", "msync");
goto bailout; goto bailout;

4
src/osal.c
View File

@ -1560,7 +1560,7 @@ MDBX_INTERNAL_FUNC int osal_fsync(mdbx_filehandle_t fd,
* see http://www.spinics.net/lists/linux-ext4/msg33714.html */ * see http://www.spinics.net/lists/linux-ext4/msg33714.html */
while (1) { while (1) {
switch (mode_bits & (MDBX_SYNC_DATA | MDBX_SYNC_SIZE)) { switch (mode_bits & (MDBX_SYNC_DATA | MDBX_SYNC_SIZE)) {
case MDBX_SYNC_NONE: case MDBX_SYNC_KICK:
return MDBX_SUCCESS /* nothing to do */; return MDBX_SUCCESS /* nothing to do */;
#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0 #if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
case MDBX_SYNC_DATA: case MDBX_SYNC_DATA:
@ -1714,7 +1714,7 @@ MDBX_INTERNAL_FUNC int osal_msync(const osal_mmap_t *map, size_t offset,
// so just leave such optimization to the libc discretion. // so just leave such optimization to the libc discretion.
// //
// assert(linux_kernel_version > 0x02061300); // assert(linux_kernel_version > 0x02061300);
// if (mode_bits == MDBX_SYNC_NONE) // if (mode_bits == MDBX_SYNC_KICK)
// return MDBX_SUCCESS; // return MDBX_SUCCESS;
#endif /* Linux */ #endif /* Linux */
if (msync(ptr, length, (mode_bits & MDBX_SYNC_DATA) ? MS_SYNC : MS_ASYNC)) if (msync(ptr, length, (mode_bits & MDBX_SYNC_DATA) ? MS_SYNC : MS_ASYNC))

2
src/osal.h
View File

@ -520,7 +520,7 @@ osal_thread_create(osal_thread_t *thread,
MDBX_INTERNAL_FUNC int osal_thread_join(osal_thread_t thread); MDBX_INTERNAL_FUNC int osal_thread_join(osal_thread_t thread);
enum osal_syncmode_bits { enum osal_syncmode_bits {
MDBX_SYNC_NONE = 0, MDBX_SYNC_KICK = 0,
MDBX_SYNC_DATA = 1, MDBX_SYNC_DATA = 1,
MDBX_SYNC_SIZE = 2, MDBX_SYNC_SIZE = 2,
MDBX_SYNC_IODQ = 4 MDBX_SYNC_IODQ = 4