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

mdbx: refine/simplify mdbx_find_oldest().

Browse Source 
Simplify b6f14780e381300beaf782fa74252b791aae082e
This commit is contained in:
Leo Yuriev 2017-10-27 15:43:06 +03:00
parent 1a27e40701
commit d4bf0a3332
1 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mdbx.c
View File

@ -1564,21 +1564,12 @@ static txnid_t mdbx_find_oldest(MDBX_txn *txn) {
return edge; return edge;
const uint32_t nothing_changed = MDBX_STRING_TETRAD("None"); const uint32_t nothing_changed = MDBX_STRING_TETRAD("None");
const uint32_t no_readers = MDBX_STRING_TETRAD("Void");
const uint32_t snap_readers_refresh_flag = lck->mti_readers_refresh_flag; const uint32_t snap_readers_refresh_flag = lck->mti_readers_refresh_flag;
mdbx_jitter4testing(false); mdbx_jitter4testing(false);
if (snap_readers_refresh_flag == nothing_changed) if (snap_readers_refresh_flag == nothing_changed)
return last_oldest; return last_oldest;
if (snap_readers_refresh_flag == no_readers) {
mdbx_notice("no-reareds, update oldest %" PRIaTXN " -> %" PRIaTXN,
last_oldest, edge);
mdbx_tassert(txn, edge >= lck->mti_oldest);
return lck->mti_oldest = edge;
}
unsigned pending = 0;
txnid_t oldest = edge; txnid_t oldest = edge;
while (true) {
lck->mti_readers_refresh_flag = nothing_changed; lck->mti_readers_refresh_flag = nothing_changed;
mdbx_coherent_barrier(); mdbx_coherent_barrier();
const unsigned snap_nreaders = lck->mti_numreaders; const unsigned snap_nreaders = lck->mti_numreaders;
@ -1586,7 +1577,6 @@ static txnid_t mdbx_find_oldest(MDBX_txn *txn) {
if (lck->mti_readers[i].mr_pid) { if (lck->mti_readers[i].mr_pid) {
/* mdbx_jitter4testing(true); */ /* mdbx_jitter4testing(true); */
const txnid_t snap = lck->mti_readers[i].mr_txnid; const txnid_t snap = lck->mti_readers[i].mr_txnid;
pending += (snap < ~(txnid_t)0);
if (oldest > snap && last_oldest <= /* ignore pending updates */ snap) { if (oldest > snap && last_oldest <= /* ignore pending updates */ snap) {
oldest = snap; oldest = snap;
if (oldest == last_oldest) if (oldest == last_oldest)
@ -1595,14 +1585,6 @@ static txnid_t mdbx_find_oldest(MDBX_txn *txn) {
} }
} }
if (unlikely(lck->mti_readers_refresh_flag != nothing_changed))
continue;
if (pending > 0 ||
mdbx_atomic_compare_and_swap32(&lck->mti_readers_refresh_flag,
nothing_changed, no_readers))
break;
}
if (oldest != last_oldest) { if (oldest != last_oldest) {
mdbx_notice("update oldest %" PRIaTXN " -> %" PRIaTXN, last_oldest, oldest); mdbx_notice("update oldest %" PRIaTXN " -> %" PRIaTXN, last_oldest, oldest);
mdbx_tassert(txn, oldest >= lck->mti_oldest); mdbx_tassert(txn, oldest >= lck->mti_oldest);
@ -3762,6 +3744,7 @@ int mdbx_txn_commit(MDBX_txn *txn) {
} }
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto fail; goto fail;
env->me_lck->mti_readers_refresh_flag = false;
end_mode = MDBX_END_COMMITTED | MDBX_END_UPDATE | MDBX_END_EOTDONE; end_mode = MDBX_END_COMMITTED | MDBX_END_UPDATE | MDBX_END_EOTDONE;
done: done: