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: fix mdbx_txn_straggler() for write-txn.

Browse Source
This commit is contained in:
Leo Yuriev 2017-06-13 19:27:52 +03:00
parent e7f9f2bd5c
commit 0ef41bef2b
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mdbx.c
View File

@ -9965,19 +9965,25 @@ int mdbx_txn_straggler(MDBX_txn *txn, int *percent)
if (unlikely(txn->mt_owner != mdbx_thread_self())) if (unlikely(txn->mt_owner != mdbx_thread_self()))
return MDBX_THREAD_MISMATCH; return MDBX_THREAD_MISMATCH;
if (unlikely(!txn->mt_ro_reader))
return -1;
MDBX_env *env = txn->mt_env; MDBX_env *env = txn->mt_env;
MDBX_meta *meta = mdbx_meta_head(env); pgno_t maxpg = env->me_maxpg;
if (percent) { if (unlikely((txn->mt_flags & MDBX_RDONLY) == 0)) {
pgno_t maxpg = env->me_maxpg; *percent = (int)((txn->mt_next_pgno * UINT64_C(100) + maxpg / 2) / maxpg);
pgno_t last = meta->mm_last_pg + 1; return -1;
if (env->me_txn)
last = env->me_txn0->mt_next_pgno;
*percent = (int)((last * UINT64_C(100) + maxpg / 2) / maxpg);
} }
txnid_t lag = mdbx_meta_txnid_fluid(env, meta) - txn->mt_ro_reader->mr_txnid;
txnid_t recent;
MDBX_meta *meta;
do {
meta = mdbx_meta_head(env);
recent = mdbx_meta_txnid_fluid(env, meta);
if (percent) {
pgno_t last = meta->mm_last_pg + 1;
*percent = (int)((last * UINT64_C(100) + maxpg / 2) / maxpg);
}
} while (unlikely(recent != mdbx_meta_txnid_fluid(env, meta)));
txnid_t lag = recent - txn->mt_ro_reader->mr_txnid;
return (lag > INT_MAX) ? INT_MAX : (int)lag; return (lag > INT_MAX) ? INT_MAX : (int)lag;
} }