ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: корректировка txn_end() для устранения лишних MDBX_TXN_OUSTED.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2024-07-27 12:44:06 +03:00
parent 7873118cdb
commit 9e3a36b74d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/txn.c
View File

@ -1361,9 +1361,9 @@ int txn_end(MDBX_txn *txn, unsigned mode) {
eASSERT(env, txn->txnid == slot->txnid.weak && eASSERT(env, txn->txnid == slot->txnid.weak &&
slot->txnid.weak >= env->lck->cached_oldest.weak); slot->txnid.weak >= env->lck->cached_oldest.weak);
} else { } else {
if ((mode & TXN_END_OUSTED) == 0 && if ((mode & TXN_END_OPMASK) != TXN_END_OUSTED &&
safe64_read(&slot->tid) == MDBX_TID_TXN_OUSTED) safe64_read(&slot->tid) == MDBX_TID_TXN_OUSTED)
mode += TXN_END_OUSTED; mode = (mode & TXN_END_OPMASK) | TXN_END_OUSTED;
do { do {
safe64_reset(&slot->txnid, false); safe64_reset(&slot->txnid, false);
atomic_store64(&slot->tid, txn->owner, mo_AcquireRelease); atomic_store64(&slot->tid, txn->owner, mo_AcquireRelease);
@ -1391,9 +1391,9 @@ int txn_end(MDBX_txn *txn, unsigned mode) {
imports.srwl_ReleaseShared(&env->remap_guard); imports.srwl_ReleaseShared(&env->remap_guard);
#endif #endif
txn->n_dbi = 0; /* prevent further DBI activity */ txn->n_dbi = 0; /* prevent further DBI activity */
txn->flags = (mode & TXN_END_OUSTED) txn->flags = ((mode & TXN_END_OPMASK) != TXN_END_OUSTED)
? MDBX_TXN_RDONLY | MDBX_TXN_FINISHED | MDBX_TXN_OUSTED ? MDBX_TXN_RDONLY | MDBX_TXN_FINISHED
: MDBX_TXN_RDONLY | MDBX_TXN_FINISHED; : MDBX_TXN_RDONLY | MDBX_TXN_FINISHED | MDBX_TXN_OUSTED;
txn->owner = 0; txn->owner = 0;
} else if (!(txn->flags & MDBX_TXN_FINISHED)) { } else if (!(txn->flags & MDBX_TXN_FINISHED)) {
ENSURE(env, ENSURE(env,