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

mdbx: avoid tsan-trap in mdbx_txn_straggler().

Browse Source 
Change-Id: Ib62cdd5592e6001a1734c321f3801722e4dcf7e4
This commit is contained in:
Leo Yuriev 2015-12-09 20:07:51 +03:00
parent 4e5d5ef935
commit 75ab3716fb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mdb.c
View File

@ -3063,8 +3063,8 @@ mdb_dbis_update(MDB_txn *txn, int keep)
env->me_numdbs = n; env->me_numdbs = n;
} }
int ATTRIBUTE_NO_SANITIZE_THREAD /* LY: avoid tsan-trap by me_txn, mm_last_pg and mt_next_pgno */
mdbx_txn_straggler(MDB_txn *txn, int *percent) int mdbx_txn_straggler(MDB_txn *txn, int *percent)
{ {
MDB_env *env; MDB_env *env;
MDB_meta *meta; MDB_meta *meta;
@ -3082,9 +3082,11 @@ mdbx_txn_straggler(MDB_txn *txn, int *percent)
env = txn->mt_env; env = txn->mt_env;
meta = mdb_meta_head_r(env); meta = mdb_meta_head_r(env);
if (percent) { if (percent) {
long cent = env->me_maxpg / 100; size_t maxpg = env->me_maxpg;
long last = env->me_txn ? env->me_txn0->mt_next_pgno : meta->mm_last_pg; size_t last = meta->mm_last_pg + 1;
*percent = (last + cent / 2) / (cent ? cent : 1); if (env->me_txn)
last = env->me_txn0->mt_next_pgno;
*percent = (last + maxpg / 2) * 100u / maxpg;
} }
lag = meta->mm_txnid - txn->mt_u.reader->mr_txnid; lag = meta->mm_txnid - txn->mt_u.reader->mr_txnid;
return (0 > (long) lag) ? ~0u >> 1: lag; return (0 > (long) lag) ? ~0u >> 1: lag;