diff --git a/cmdline/elem.c b/cmdline/elem.c index 46849497..a5049e0d 100644 --- a/cmdline/elem.c +++ b/cmdline/elem.c @@ -1467,7 +1467,9 @@ void bucket_to_list(tommy_hashdyn* bucket_hash, tommy_list* bucket_list, block_o tommy_list_foreach(bucket_list, (tommy_foreach_func*)bucket_free); tommy_list_init(bucket_list); - log_tag("content_info:bucket_count:%" PRIu64 "\n", (uint64_t)tommy_hashdyn_count(bucket_hash)); + log_tag("list:bucket_begin\n"); + + log_tag("bucket:count:%" PRIu64 "\n", (uint64_t)tommy_hashdyn_count(bucket_hash)); tommy_hashdyn_to_list(bucket_hash, bucket_list); @@ -1477,8 +1479,13 @@ void bucket_to_list(tommy_hashdyn* bucket_hash, tommy_list* bucket_list, block_o for (tommy_node* i = tommy_list_head(bucket_list); i != 0; i = i->next) { struct snapraid_bucket* entry = i->data; count += entry->count_scrubbed + entry->count_justsynced; - log_tag("content_info:bucket:%" PRIu64 ":%u:%u\n", (uint64_t)entry->time_at, entry->count_scrubbed, entry->count_justsynced); + log_tag("bucket:entry:%" PRIu64 ":%u:%u\n", (uint64_t)entry->time_at, entry->count_scrubbed, entry->count_justsynced); } + + log_tag("bucket:block_count:%u\n", count); + + log_tag("list:bucket_end\n"); + *bucketcount = count; } diff --git a/cmdline/scan.c b/cmdline/scan.c index fd55ae0c..d0bd67c9 100644 --- a/cmdline/scan.c +++ b/cmdline/scan.c @@ -1640,6 +1640,8 @@ static int state_diffscan(struct snapraid_state* state, int is_diff) else msg_progress("Scanning...\n"); + log_tag("list:scan_begin\n"); + /* allocate all the scan data */ for (i = state->disklist; i != 0; i = i->next) { struct snapraid_disk* disk = i->data; @@ -2005,6 +2007,7 @@ static int state_diffscan(struct snapraid_state* state, int is_diff) log_tag("summary:moved:%u\n", total.count_move); log_tag("summary:copied:%u\n", total.count_copy); log_tag("summary:restored:%u\n", total.count_restore); + log_tag("list:scan_end\n"); no_difference = !total.count_move && !total.count_copy && !total.count_restore && !total.count_change && !total.count_remove && !total.count_insert; diff --git a/doc/snapraid_log.1 b/doc/snapraid_log.1 index 92a3780a..50e37dc1 100644 --- a/doc/snapraid_log.1 +++ b/doc/snapraid_log.1 @@ -339,12 +339,15 @@ The total counter of blocks. .PD .RE .TP -.B content_info:bucket_count: -Total number of info records about past scrub and sync -operations stored in the content file. +.B bucket_count: +Total number of info records listed with \`bucket\`. .TP -.B content_info:bucket: