ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-03-13 20:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: allow MDBX_MAPASYNC for particular txn.

Browse Source 
Change-Id: I0ed1a7567a3f7bfbae2bfa6995ad8f6c327d91a9
This commit is contained in:
Leonid Yuriev 2019-09-14 17:47:18 +03:00
parent 1402a511a4
commit 5f22a5568d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/elements/core.c
View File

@ -3632,19 +3632,21 @@ int mdbx_txn_begin(MDBX_env *env, MDBX_txn *parent, unsigned flags,
return MDBX_PANIC; return MDBX_PANIC;
#if !defined(_WIN32) && !defined(_WIN64) #if !defined(_WIN32) && !defined(_WIN64)
/* Don't check env->me_map until lock to avoid race with re-mapping for /* Don't check env->me_map until lock to
* shrinking */ * avoid race with re-mapping for shrinking */
if (unlikely(!env->me_map)) if (unlikely(!env->me_map))
return MDBX_EPERM; return MDBX_EPERM;
#endif /* Windows */ #endif /* Windows */
flags &= MDBX_TXN_BEGIN_FLAGS; if (unlikely(flags & ~MDBX_TXN_BEGIN_FLAGS))
flags |= env->me_flags & MDBX_WRITEMAP; return MDBX_EINVAL;
if (unlikely(env->me_flags & MDBX_RDONLY & if (unlikely(env->me_flags & MDBX_RDONLY &
~flags)) /* write txn in RDONLY env */ ~flags)) /* write txn in RDONLY env */
return MDBX_EACCESS; return MDBX_EACCESS;
flags |= env->me_flags & MDBX_WRITEMAP;
if (parent) { if (parent) {
if (unlikely(parent->mt_signature != MDBX_MT_SIGNATURE)) if (unlikely(parent->mt_signature != MDBX_MT_SIGNATURE))
return MDBX_EBADSIGN; return MDBX_EBADSIGN;
@ -5659,10 +5661,9 @@ static int mdbx_sync_locked(MDBX_env *env, unsigned flags,
const uint64_t autosync_period = *env->me_autosync_period; const uint64_t autosync_period = *env->me_autosync_period;
if (autosync_period && *env->me_unsynced_timeout == 0) if (autosync_period && *env->me_unsynced_timeout == 0)
*env->me_unsynced_timeout = mdbx_osal_monotime() + autosync_period; *env->me_unsynced_timeout = mdbx_osal_monotime() + autosync_period;
pending->mm_datasync_sign = pending->mm_datasync_sign = F_ISSET(env->me_flags, MDBX_UTTERLY_NOSYNC)
(flags & MDBX_UTTERLY_NOSYNC) == MDBX_UTTERLY_NOSYNC ? MDBX_DATASIGN_NONE
? MDBX_DATASIGN_NONE : MDBX_DATASIGN_WEAK;
: MDBX_DATASIGN_WEAK;
} }
MDBX_meta *target = nullptr; MDBX_meta *target = nullptr;

2
src/elements/internals.h
View File

@ -726,7 +726,7 @@ struct MDBX_txn {
/* Transaction Flags */ /* Transaction Flags */
/* mdbx_txn_begin() flags */ /* mdbx_txn_begin() flags */
#define MDBX_TXN_BEGIN_FLAGS \ #define MDBX_TXN_BEGIN_FLAGS \
(MDBX_NOMETASYNC | MDBX_NOSYNC | MDBX_RDONLY | MDBX_TRYTXN) (MDBX_NOMETASYNC | MDBX_NOSYNC | MDBX_MAPASYNC | MDBX_RDONLY | MDBX_TRYTXN)
/* internal txn flags */ /* internal txn flags */
#define MDBX_TXN_FINISHED 0x01 /* txn is finished or never began */ #define MDBX_TXN_FINISHED 0x01 /* txn is finished or never began */
#define MDBX_TXN_ERROR 0x02 /* txn is unusable after an error */ #define MDBX_TXN_ERROR 0x02 /* txn is unusable after an error */