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

mdbx: minor refine mdbx_txn_renew0().

Browse Source
This commit is contained in:
Leo Yuriev 2018-08-01 18:17:46 +03:00
parent e06ab1d2a5
commit 5ed725dc29
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mdbx.c
View File

@ -2921,7 +2921,6 @@ static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) {
return MDBX_BAD_RSLOT; return MDBX_BAD_RSLOT;
} else if (env->me_lck) { } else if (env->me_lck) {
unsigned slot, nreaders; unsigned slot, nreaders;
const mdbx_pid_t pid = env->me_pid;
const mdbx_tid_t tid = mdbx_thread_self(); const mdbx_tid_t tid = mdbx_thread_self();
mdbx_assert(env, env->me_lck->mti_magic_and_version == MDBX_LOCK_MAGIC); mdbx_assert(env, env->me_lck->mti_magic_and_version == MDBX_LOCK_MAGIC);
mdbx_assert(env, env->me_lck->mti_os_and_format == MDBX_LOCK_FORMAT); mdbx_assert(env, env->me_lck->mti_os_and_format == MDBX_LOCK_FORMAT);
@ -2931,13 +2930,13 @@ static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) {
return rc; return rc;
rc = MDBX_SUCCESS; rc = MDBX_SUCCESS;
if (unlikely(env->me_live_reader != pid)) { if (unlikely(env->me_live_reader != env->me_pid)) {
rc = mdbx_rpid_set(env); rc = mdbx_rpid_set(env);
if (unlikely(rc != MDBX_SUCCESS)) { if (unlikely(rc != MDBX_SUCCESS)) {
mdbx_rdt_unlock(env); mdbx_rdt_unlock(env);
return rc; return rc;
} }
env->me_live_reader = pid; env->me_live_reader = env->me_pid;
} }
while (1) { while (1) {
@ -2970,12 +2969,14 @@ static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) {
env->me_lck->mti_numreaders = ++nreaders; env->me_lck->mti_numreaders = ++nreaders;
if (env->me_close_readers < nreaders) if (env->me_close_readers < nreaders)
env->me_close_readers = nreaders; env->me_close_readers = nreaders;
r->mr_pid = pid; r->mr_pid = env->me_pid;
mdbx_rdt_unlock(env); mdbx_rdt_unlock(env);
if (likely(env->me_flags & MDBX_ENV_TXKEY)) if (likely(env->me_flags & MDBX_ENV_TXKEY)) {
assert(env->me_live_reader == env->me_pid);
mdbx_thread_rthc_set(env->me_txkey, r); mdbx_thread_rthc_set(env->me_txkey, r);
} }
}
while (1) { while (1) {
MDBX_meta *const meta = mdbx_meta_head(env); MDBX_meta *const meta = mdbx_meta_head(env);