Skip to content

Commit 9a3c7af

Browse files
committed
Merge #19317: Add a left-justified width field to log2_work component for a uniform debug.log output
c858302 Change format of log2_work for uniform output (zero-padded) (jmorgan) Pull request description: Motivation: It's jarring to watch the output of `tail -f ~/btcdata/debug.log` scroll by and very frequently see columns not lining up correctly because `log2_work` somtimes has less precision than 8 digits. Current display: ``` 2020-06-18T02:54:42Z UpdateTip: new best=0000000000000000107f877e4920643f9fb06090fa7551cd1cdd83b857f520aa height=382038 version=0x00000003 log2_work=83.558653 tx=90953616 date='2015-11-04T17:11:44Z' progress=0.166675 cache=117.6MiB(966410txo) 2020-06-18T02:54:51Z UpdateTip: new best=0000000000000000019a4de585d30d1a8cc13c7a1972d11b4945635c9556acb5 height=382039 version=0x00000003 log2_work=83.55868 tx=90955936 date='2015-11-04T17:19:39Z' progress=0.166679 cache=117.9MiB(968799txo) ``` Display with this commit: ``` 2020-06-18T02:54:42Z UpdateTip: new best=0000000000000000107f877e4920643f9fb06090fa7551cd1cdd83b857f520aa height=382038 version=0x00000003 log2_work=83.558653 tx=90953616 date='2015-11-04T17:11:44Z' progress=0.166675 cache=117.6MiB(966410txo) 2020-06-18T02:54:51Z UpdateTip: new best=0000000000000000019a4de585d30d1a8cc13c7a1972d11b4945635c9556acb5 height=382039 version=0x00000003 log2_work=83.55868 tx=90955936 date='2015-11-04T17:19:39Z' progress=0.166679 cache=117.9MiB(968799txo) ``` ACKs for top commit: practicalswift: ACK c858302 -- patch looks great :) achow101: ACK c858302 laanwj: Tested ACK c858302 Tree-SHA512: 16cbe419c4993ad51019c676e8ca409ef1025b803cc598437c780dd7ca003d7e4ad421f451e9a374e0070ee9b3ee601b7aba849e1f346798f9321d1bce5c4401
2 parents 45f58db + c858302 commit 9a3c7af

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/validation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,12 +1421,12 @@ void static InvalidChainFound(CBlockIndex* pindexNew) EXCLUSIVE_LOCKS_REQUIRED(c
14211421
pindexBestHeader = ::ChainActive().Tip();
14221422
}
14231423

1424-
LogPrintf("%s: invalid block=%s height=%d log2_work=%.8g date=%s\n", __func__,
1424+
LogPrintf("%s: invalid block=%s height=%d log2_work=%f date=%s\n", __func__,
14251425
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
14261426
log(pindexNew->nChainWork.getdouble())/log(2.0), FormatISO8601DateTime(pindexNew->GetBlockTime()));
14271427
CBlockIndex *tip = ::ChainActive().Tip();
14281428
assert (tip);
1429-
LogPrintf("%s: current best=%s height=%d log2_work=%.8g date=%s\n", __func__,
1429+
LogPrintf("%s: current best=%s height=%d log2_work=%f date=%s\n", __func__,
14301430
tip->GetBlockHash().ToString(), ::ChainActive().Height(), log(tip->nChainWork.getdouble())/log(2.0),
14311431
FormatISO8601DateTime(tip->GetBlockTime()));
14321432
CheckForkWarningConditions();
@@ -2476,7 +2476,7 @@ void static UpdateTip(const CBlockIndex* pindexNew, const CChainParams& chainPar
24762476
if (nUpgraded > 0)
24772477
AppendWarning(warning_messages, strprintf(_("%d of last 100 blocks have unexpected version"), nUpgraded));
24782478
}
2479-
LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)%s\n", __func__,
2479+
LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%f tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)%s\n", __func__,
24802480
pindexNew->GetBlockHash().ToString(), pindexNew->nHeight, pindexNew->nVersion,
24812481
log(pindexNew->nChainWork.getdouble())/log(2.0), (unsigned long)pindexNew->nChainTx,
24822482
FormatISO8601DateTime(pindexNew->GetBlockTime()),

0 commit comments

Comments
 (0)