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

mdbx: don't block close_env() if other write-txn running.

Browse Source 
Change-Id: I1d19afcc245578681b8bc3ee3966ac38bc596ec4
This commit is contained in:
Leo Yuriev 2018-06-12 13:18:17 +03:00
parent fdc248384e
commit 634efbe34b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mdbx.c
View File

@ -2711,7 +2711,7 @@ fail:
return rc; return rc;
} }
int mdbx_env_sync(MDBX_env *env, int force) { static int mdbx_env_sync_ex(MDBX_env *env, int force, int nonblock) {
if (unlikely(!env)) if (unlikely(!env))
return MDBX_EINVAL; return MDBX_EINVAL;
@ -2729,7 +2729,7 @@ int mdbx_env_sync(MDBX_env *env, int force) {
(!env->me_txn0 || env->me_txn0->mt_owner != mdbx_thread_self()); (!env->me_txn0 || env->me_txn0->mt_owner != mdbx_thread_self());
if (outside_txn) { if (outside_txn) {
int rc = mdbx_txn_lock(env, false); int rc = mdbx_txn_lock(env, nonblock);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
} }
@ -2758,7 +2758,7 @@ int mdbx_env_sync(MDBX_env *env, int force) {
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
rc = mdbx_txn_lock(env, false); rc = mdbx_txn_lock(env, nonblock);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
@ -2785,6 +2785,10 @@ int mdbx_env_sync(MDBX_env *env, int force) {
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
int mdbx_env_sync(MDBX_env *env, int force) {
return mdbx_env_sync_ex(env, force, false);
}
/* Back up parent txn's cursors, then grab the originals for tracking */ /* Back up parent txn's cursors, then grab the originals for tracking */
static int mdbx_cursor_shadow(MDBX_txn *src, MDBX_txn *dst) { static int mdbx_cursor_shadow(MDBX_txn *src, MDBX_txn *dst) {
MDBX_cursor *mc, *bk; MDBX_cursor *mc, *bk;
@ -5940,8 +5944,10 @@ int __cold mdbx_env_close_ex(MDBX_env *env, int dont_sync) {
if (env->me_txn0 && env->me_txn0->mt_owner && if (env->me_txn0 && env->me_txn0->mt_owner &&
env->me_txn0->mt_owner != mdbx_thread_self()) env->me_txn0->mt_owner != mdbx_thread_self())
return MDBX_BUSY; return MDBX_BUSY;
if (!dont_sync) if (!dont_sync) {
rc = mdbx_env_sync(env, true); rc = mdbx_env_sync_ex(env, true, true);
rc = (rc == MDBX_BUSY) ? MDBX_SUCCESS : rc;
}
} }
VALGRIND_DESTROY_MEMPOOL(env); VALGRIND_DESTROY_MEMPOOL(env);
@ -5968,7 +5974,7 @@ int __cold mdbx_env_close_ex(MDBX_env *env, int dont_sync) {
return rc; return rc;
} }
int mdbx_env_close(MDBX_env *env) { return mdbx_env_close_ex(env, 0); } int mdbx_env_close(MDBX_env *env) { return mdbx_env_close_ex(env, false); }
/* Compare two items pointing at aligned unsigned int's. */ /* Compare two items pointing at aligned unsigned int's. */
static int __hot mdbx_cmp_int_ai(const MDBX_val *a, const MDBX_val *b) { static int __hot mdbx_cmp_int_ai(const MDBX_val *a, const MDBX_val *b) {
@ -11473,7 +11479,7 @@ int __cold mdbx_env_set_syncbytes(MDBX_env *env, size_t bytes) {
return MDBX_EBADSIGN; return MDBX_EBADSIGN;
env->me_sync_threshold = bytes; env->me_sync_threshold = bytes;
return env->me_map ? mdbx_env_sync(env, 0) : MDBX_SUCCESS; return env->me_map ? mdbx_env_sync(env, false) : MDBX_SUCCESS;
} }
int __cold mdbx_env_set_oomfunc(MDBX_env *env, MDBX_oom_func *oomfunc) { int __cold mdbx_env_set_oomfunc(MDBX_env *env, MDBX_oom_func *oomfunc) {