diff --git a/src/core.c b/src/core.c index b8a1c5d5..766bd2c7 100644 --- a/src/core.c +++ b/src/core.c @@ -8810,7 +8810,7 @@ retry_noaccount: goto bailout; mdbx_tassert(txn, cleaned_gc_id < env->me_lck->mti_oldest_reader.weak); - mdbx_trace("%s.cleanup-reclaimed-id [%u]%" PRIaTXN, dbg_prefix_mode, + mdbx_trace("%s: cleanup-reclaimed-id [%u]%" PRIaTXN, dbg_prefix_mode, cleaned_gc_slot, cleaned_gc_id); mdbx_tassert(txn, *txn->tw.cursors == &couple.outer); rc = mdbx_cursor_del(&couple.outer, 0); @@ -8852,7 +8852,7 @@ retry_noaccount: } mdbx_tassert(txn, cleaned_gc_id <= txn->tw.last_reclaimed); mdbx_tassert(txn, cleaned_gc_id < env->me_lck->mti_oldest_reader.weak); - mdbx_trace("%s.cleanup-reclaimed-id %" PRIaTXN, dbg_prefix_mode, + mdbx_trace("%s: cleanup-reclaimed-id %" PRIaTXN, dbg_prefix_mode, cleaned_gc_id); mdbx_tassert(txn, *txn->tw.cursors == &couple.outer); rc = mdbx_cursor_del(&couple.outer, 0); @@ -8984,7 +8984,7 @@ retry_noaccount: mdbx_assert(env, data.iov_len == MDBX_PNL_SIZEOF(txn->tw.retired_pages)); memcpy(data.iov_base, txn->tw.retired_pages, data.iov_len); - mdbx_trace("%s.put-retired #%u @ %" PRIaTXN, dbg_prefix_mode, + mdbx_trace("%s: put-retired #%u @ %" PRIaTXN, dbg_prefix_mode, retired_stored, txn->mt_txnid); if (mdbx_log_enabled(MDBX_LOG_EXTRA)) { @@ -8997,10 +8997,11 @@ retry_noaccount: mdbx_debug_extra_print("%s\n", "."); } if (unlikely(amount != MDBX_PNL_SIZE(txn->tw.reclaimed_pglist))) { - mdbx_trace("%s.reclaimed-list changed %u -> %u, retry", dbg_prefix_mode, - amount, (unsigned)MDBX_PNL_SIZE(txn->tw.reclaimed_pglist)); - goto retry_noaccount /* rare case, but avoids GC fragmentation and one - cycle. */ + mdbx_trace("%s: reclaimed-list changed %u -> %u, retry", + dbg_prefix_mode, amount, + (unsigned)MDBX_PNL_SIZE(txn->tw.reclaimed_pglist)); + goto retry_noaccount /* rare case, but avoids GC fragmentation + and one cycle. */ ; } continue; @@ -9281,7 +9282,7 @@ retry_noaccount: key.iov_len = sizeof(reservation_gc_id); key.iov_base = &reservation_gc_id; data.iov_len = (chunk + 1) * sizeof(pgno_t); - mdbx_trace("%s.reserve: %u [%u...%u) @%" PRIaTXN, dbg_prefix_mode, chunk, + mdbx_trace("%s: reserve %u [%u...%u) @%" PRIaTXN, dbg_prefix_mode, chunk, settled + 1, settled + chunk + 1, reservation_gc_id); mdbx_prep_backlog(txn, &couple.outer, data.iov_len); rc = mdbx_cursor_put(&couple.outer, &key, &data, @@ -9294,7 +9295,7 @@ retry_noaccount: clean_reserved_gc_pnl(env, data); settled += chunk; - mdbx_trace("%s.settled %u (+%u), continue", dbg_prefix_mode, settled, + mdbx_trace("%s: settled %u (+%u), continue", dbg_prefix_mode, settled, chunk); if (txn->tw.lifo_reclaimed && @@ -9364,7 +9365,7 @@ retry_noaccount: goto retry; } fill_gc_id = txn->tw.lifo_reclaimed[filled_gc_slot]; - mdbx_trace("%s.seek-reservation @%" PRIaTXN " at lifo_reclaimed[%u]", + mdbx_trace("%s: seek-reservation @%" PRIaTXN " at lifo_reclaimed[%u]", dbg_prefix_mode, fill_gc_id, filled_gc_slot); key.iov_base = &fill_gc_id; key.iov_len = sizeof(fill_gc_id); @@ -9428,7 +9429,7 @@ retry_noaccount: pgno_t *src = MDBX_PNL_BEGIN(txn->tw.reclaimed_pglist) + left - chunk; memcpy(dst, src, chunk * sizeof(pgno_t)); pgno_t *from = src, *to = src + chunk; - mdbx_trace("%s.fill: %u [ %u:%" PRIaPGNO "...%u:%" PRIaPGNO + mdbx_trace("%s: fill %u [ %u:%" PRIaPGNO "...%u:%" PRIaPGNO "] @%" PRIaTXN, dbg_prefix_mode, chunk, (unsigned)(from - txn->tw.reclaimed_pglist), from[0],