diff options
| author | Dan Engelbrecht <[email protected]> | 2025-04-07 10:00:08 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-04-07 10:00:08 +0200 |
| commit | fe6fb23a53bee3ffdb47b285a9446ea0ac4831fd (patch) | |
| tree | 220fafc7faaca0dab51bde6ce5d074684eefa580 /src | |
| parent | 5.6.3 (diff) | |
| download | zen-fe6fb23a53bee3ffdb47b285a9446ea0ac4831fd.tar.xz zen-fe6fb23a53bee3ffdb47b285a9446ea0ac4831fd.zip | |
improved layout of end of run stats output (#348)
Diffstat (limited to 'src')
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index d503ae45e..2f4a2921e 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -3829,7 +3829,7 @@ namespace { const uint64_t DownloadedCount = ValidateDownloadStats.DownloadedChunkCount + ValidateDownloadStats.DownloadedBlockCount; const uint64_t DownloadedByteCount = ValidateDownloadStats.DownloadedChunkByteCount + ValidateDownloadStats.DownloadedBlockByteCount; - ValidateInfo = fmt::format("\n Verified: {} ({}) {}B/sec in {}", + ValidateInfo = fmt::format("\n Verified: {:>8} ({}), {}B/sec, {}", DownloadedCount, NiceBytes(DownloadedByteCount), NiceNum(GetBytesPerSecond(ValidateStats.ElapsedWallTimeUS, DownloadedByteCount)), @@ -3837,14 +3837,14 @@ namespace { } ZEN_CONSOLE( - "Uploaded part {} ('{}') to build {} in {} \n" - " Scanned files: {} ({}) {}B/sec in {}\n" - " New data: {} ({:.1f}%)\n" - " New blocks: {} ({}) {}B/sec\n" - " New chunks: {} ({} -> {}) {}B/sec\n" - " Uploaded: {} ({}) {}bits/sec\n" - " Blocks: {} ({})\n" - " Chunks: {} ({}){}" + "Uploaded part {} ('{}') to build {}, {}\n" + " Scanned files: {:>8} ({}), {}B/sec, {}\n" + " New data: {:>8} ({}) {:.1f}%\n" + " New blocks: {:>8} ({} -> {}), {}B/sec, {}\n" + " New chunks: {:>8} ({} -> {}), {}B/sec, {}\n" + " Uploaded: {:>8} ({}), {}bits/sec, {}\n" + " Blocks: {:>8} ({})\n" + " Chunks: {:>8} ({}){}" "{}", BuildPartId, BuildPartName, @@ -3856,21 +3856,26 @@ namespace { NiceNum(GetBytesPerSecond(ChunkingStats.ElapsedWallTimeUS, ChunkingStats.BytesHashed)), NiceTimeSpanMs(ChunkingStats.ElapsedWallTimeUS / 1000), + FindBlocksStats.NewBlocksChunkCount + LooseChunksStats.CompressedChunkCount, NiceBytes(FindBlocksStats.NewBlocksChunkByteCount + LooseChunksStats.CompressedChunkBytes), DeltaByteCountPercent, GenerateBlocksStats.GeneratedBlockCount.load(), + NiceBytes(FindBlocksStats.NewBlocksChunkByteCount), NiceBytes(GenerateBlocksStats.GeneratedBlockByteCount.load()), NiceNum(GetBytesPerSecond(GenerateBlocksStats.GenerateBlocksElapsedWallTimeUS, GenerateBlocksStats.GeneratedBlockByteCount)), + NiceTimeSpanMs(GenerateBlocksStats.GenerateBlocksElapsedWallTimeUS / 1000), LooseChunksStats.CompressedChunkCount.load(), NiceBytes(LooseChunksStats.ChunkByteCount), NiceBytes(LooseChunksStats.CompressedChunkBytes.load()), NiceNum(GetBytesPerSecond(LooseChunksStats.CompressChunksElapsedWallTimeUS, LooseChunksStats.ChunkByteCount)), + NiceTimeSpanMs(LooseChunksStats.CompressChunksElapsedWallTimeUS / 1000), - NiceBytes(UploadStats.BlockCount.load() + UploadStats.ChunkCount.load()), + UploadStats.BlockCount.load() + UploadStats.ChunkCount.load(), NiceBytes(UploadStats.BlocksBytes + UploadStats.ChunksBytes), NiceNum(GetBytesPerSecond(UploadStats.ElapsedWallTimeUS, (UploadStats.ChunksBytes + UploadStats.BlocksBytes) * 8)), + NiceTimeSpanMs(UploadStats.ElapsedWallTimeUS / 1000), UploadStats.BlockCount.load(), NiceBytes(UploadStats.BlocksBytes.load()), |