diff --git a/src/proto.h b/src/proto.h index 80f9394b..28562eb2 100644 --- a/src/proto.h +++ b/src/proto.h @@ -61,20 +61,19 @@ MDBX_INTERNAL int txn_unpark(MDBX_txn *txn); MDBX_INTERNAL int txn_check_badbits_parked(const MDBX_txn *txn, int bad_bits); #define TXN_END_NAMES \ - {"committed", "empty-commit", "abort", "reset", \ - "reset-tmp", "fail-begin", "fail-beginchild", "ousted"} + {"committed", "empty-commit", "abort", "reset", \ + "fail-begin", "fail-beginchild", "ousted", nullptr} enum { /* txn_end operation number, for logging */ TXN_END_COMMITTED, TXN_END_PURE_COMMIT, TXN_END_ABORT, TXN_END_RESET, - TXN_END_RESET_TMP, TXN_END_FAIL_BEGIN, TXN_END_FAIL_BEGINCHILD, TXN_END_OUSTED, - TXN_END_OPMASK = 0x0F /* mask for txn_end() operation number */, + TXN_END_OPMASK = 0x07 /* mask for txn_end() operation number */, TXN_END_UPDATE = 0x10 /* update env state (DBIs) */, TXN_END_FREE = 0x20 /* free txn unless it is env.basal_txn */, TXN_END_EOTDONE = 0x40 /* txn's cursors already closed */, diff --git a/src/txn.c b/src/txn.c index bd8a1a59..724fe2b1 100644 --- a/src/txn.c +++ b/src/txn.c @@ -1350,11 +1350,11 @@ int txn_end(MDBX_txn *txn, unsigned mode) { MDBX_env *env = txn->env; static const char *const names[] = TXN_END_NAMES; - DEBUG("%s txn %" PRIaTXN "%c %p on env %p, root page %" PRIaPGNO + DEBUG("%s txn %" PRIaTXN "%c-0x%X %p on env %p, root page %" PRIaPGNO "/%" PRIaPGNO, names[mode & TXN_END_OPMASK], txn->txnid, - (txn->flags & MDBX_TXN_RDONLY) ? 'r' : 'w', (void *)txn, (void *)env, - txn->dbs[MAIN_DBI].root, txn->dbs[FREE_DBI].root); + (txn->flags & MDBX_TXN_RDONLY) ? 'r' : 'w', txn->flags, (void *)txn, + (void *)env, txn->dbs[MAIN_DBI].root, txn->dbs[FREE_DBI].root); if (!(mode & TXN_END_EOTDONE)) /* !(already closed cursors) */ done_cursors(txn, false); @@ -1374,7 +1374,7 @@ int txn_end(MDBX_txn *txn, unsigned mode) { } else { if ((mode & TXN_END_OPMASK) != TXN_END_OUSTED && safe64_read(&slot->tid) == MDBX_TID_TXN_OUSTED) - mode = (mode & TXN_END_OPMASK) | TXN_END_OUSTED; + mode = (mode & ~TXN_END_OPMASK) | TXN_END_OUSTED; do { safe64_reset(&slot->txnid, false); atomic_store64(&slot->tid, txn->owner, mo_AcquireRelease);