@@ -94,13 +94,17 @@ static double strdedup_elapsed_param_ms(Tickspan t) {
9494void StringDedup::Stat::log_summary (const Stat* last_stat, const Stat* total_stat) {
9595 log_info (stringdedup)(
9696 " Concurrent String Deduplication "
97- " %zu/" STRDEDUP_BYTES_FORMAT_NS " (new), "
97+ " %zu (inspected), "
98+ " %zu/" STRDEDUP_BYTES_FORMAT_NS " (new unknown), "
9899 " %zu/" STRDEDUP_BYTES_FORMAT_NS " (deduped), "
99- " avg " STRDEDUP_PERCENT_FORMAT_NS " , "
100+ " total avg deduped/new unknown bytes " STRDEDUP_PERCENT_FORMAT_NS " , "
101+ STRDEDUP_BYTES_FORMAT_NS " (total deduped)," STRDEDUP_BYTES_FORMAT_NS " (total new unknown), "
100102 STRDEDUP_ELAPSED_FORMAT_MS " of " STRDEDUP_ELAPSED_FORMAT_MS,
103+ last_stat->_inspected ,
101104 last_stat->_new , STRDEDUP_BYTES_PARAM (last_stat->_new_bytes ),
102105 last_stat->_deduped , STRDEDUP_BYTES_PARAM (last_stat->_deduped_bytes ),
103106 percent_of (total_stat->_deduped_bytes , total_stat->_new_bytes ),
107+ STRDEDUP_BYTES_PARAM (total_stat->_deduped_bytes ), STRDEDUP_BYTES_PARAM (total_stat->_new_bytes ),
104108 strdedup_elapsed_param_ms (last_stat->_process_elapsed ),
105109 strdedup_elapsed_param_ms (last_stat->_active_elapsed ));
106110}
@@ -210,14 +214,14 @@ void StringDedup::Stat::log_statistics() const {
210214 double deduped_bytes_percent = percent_of (_deduped_bytes, _new_bytes);
211215 double replaced_percent = percent_of (_replaced, _new);
212216 double deleted_percent = percent_of (_deleted, _new);
213- log_debug (stringdedup)(" Inspected: %12zu" , _inspected);
214- log_debug (stringdedup)(" Known: %12zu(%5.1f%%)" , _known, known_percent);
215- log_debug (stringdedup)(" Shared: %12zu(%5.1f%%)" , _known_shared, known_shared_percent);
216- log_debug (stringdedup)(" New: %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT,
217+ log_debug (stringdedup)(" Inspected: %12zu" , _inspected);
218+ log_debug (stringdedup)(" Known: %12zu(%5.1f%%)" , _known, known_percent);
219+ log_debug (stringdedup)(" Shared: %12zu(%5.1f%%)" , _known_shared, known_shared_percent);
220+ log_debug (stringdedup)(" New unknown: %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT,
217221 _new, new_percent, STRDEDUP_BYTES_PARAM (_new_bytes));
218- log_debug (stringdedup)(" Replaced: %12zu(%5.1f%%)" , _replaced, replaced_percent);
219- log_debug (stringdedup)(" Deleted: %12zu(%5.1f%%)" , _deleted, deleted_percent);
220- log_debug (stringdedup)(" Deduplicated: %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT " (%5.1f%%)" ,
222+ log_debug (stringdedup)(" Replaced: %12zu(%5.1f%%)" , _replaced, replaced_percent);
223+ log_debug (stringdedup)(" Deleted: %12zu(%5.1f%%)" , _deleted, deleted_percent);
224+ log_debug (stringdedup)(" Deduplicated: %12zu(%5.1f%%)" STRDEDUP_BYTES_FORMAT " (%5.1f%%)" ,
221225 _deduped, deduped_percent, STRDEDUP_BYTES_PARAM (_deduped_bytes), deduped_bytes_percent);
222226 log_debug (stringdedup)(" Skipped: %zu (dead), %zu (incomplete), %zu (shared)" ,
223227 _skipped_dead, _skipped_incomplete, _skipped_shared);
0 commit comments