Reporting speed with -check_md5, -compare, -find, -compare_l, -update

This commit is contained in:
Thomas Schmitt 2012-01-23 10:40:59 +00:00
parent 9caa063957
commit 9f5e6c925a
7 changed files with 8 additions and 8 deletions

View File

@ -2011,7 +2011,7 @@ int Xorriso_check_md5_range(struct XorrisO *xorriso, off_t start_lba,
xorriso->pacifier_count+= data_count; xorriso->pacifier_count+= data_count;
xorriso->pacifier_byte_count+= data_count; xorriso->pacifier_byte_count+= data_count;
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 0); xorriso->pacifier_count, 0, "", 8);
} }
iso_md5_end(&ctx, data_md5); iso_md5_end(&ctx, data_md5);
ret= 1; ret= 1;

View File

@ -1368,7 +1368,7 @@ ex:;
xorriso->pacifier_interval= mem_pci; xorriso->pacifier_interval= mem_pci;
if(mem_lut!=xorriso->last_update_time && !(flag&2)) if(mem_lut!=xorriso->last_update_time && !(flag&2))
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 1); xorriso->pacifier_count, 0, "", 1 | 8 | 32);
} }
if(do_report) { if(do_report) {
if(optc == 0) { if(optc == 0) {
@ -1943,7 +1943,7 @@ int Xorriso_option_compare(struct XorrisO *xorriso, char *disk_path,
xorriso->pacifier_interval= mem_pci; xorriso->pacifier_interval= mem_pci;
if(mem_lut!=xorriso->last_update_time && !(flag&2)) if(mem_lut!=xorriso->last_update_time && !(flag&2))
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 1); xorriso->pacifier_count, 0, "", 1 | 8 | 32);
report_outcome:; report_outcome:;
if(ret>0) { if(ret>0) {
sprintf(xorriso->result_line, sprintf(xorriso->result_line,

View File

@ -1117,7 +1117,7 @@ ex:;
xorriso->pacifier_count, 0, "", 1 | 2); xorriso->pacifier_count, 0, "", 1 | 2);
else if(mem_lut!=xorriso->last_update_time && mem_lut!=0.0 && !(flag&2)) else if(mem_lut!=xorriso->last_update_time && mem_lut!=0.0 && !(flag&2))
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 1); xorriso->pacifier_count, 0, "", 1 | 8 | 32);
if(first_job->action == 35 && !(flag & 1)) if(first_job->action == 35 && !(flag & 1))
Xorriso_report_md5_outcome(xorriso, first_job->target, 0); Xorriso_report_md5_outcome(xorriso, first_job->target, 0);
if(first_job->action == 40) { if(first_job->action == 40) {

View File

@ -617,7 +617,7 @@ int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
xorriso->pacifier_total, "", 1); xorriso->pacifier_total, "", 1);
else if(mode==1 || mode==2) else if(mode==1 || mode==2)
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 1); xorriso->pacifier_count, 0, "", 1 | 8 | 32);
else if(mode==3) else if(mode==3)
Xorriso_pacifier_callback(xorriso, "files restored",xorriso->pacifier_count, Xorriso_pacifier_callback(xorriso, "files restored",xorriso->pacifier_count,
xorriso->pacifier_total, "", 1|4); xorriso->pacifier_total, "", 1|4);

View File

@ -1669,7 +1669,7 @@ int Xorriso_option_update(struct XorrisO *xorriso, char *disk_path,
xorriso->pacifier_interval= mem_pci; xorriso->pacifier_interval= mem_pci;
if(mem_lut!=xorriso->last_update_time && !(flag & (2 | 4))) if(mem_lut!=xorriso->last_update_time && !(flag & (2 | 4)))
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 1); xorriso->pacifier_count, 0, "", 1 | 8 | 32);
report_outcome:; report_outcome:;
if(ret>0) { if(ret>0) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,

View File

@ -2088,7 +2088,7 @@ int Xorriso_check_md5(struct XorrisO *xorriso, void *in_node, char *path,
xorriso->pacifier_count+= rret; xorriso->pacifier_count+= rret;
xorriso->pacifier_byte_count+= rret; xorriso->pacifier_byte_count+= rret;
Xorriso_pacifier_callback(xorriso, "content bytes read", Xorriso_pacifier_callback(xorriso, "content bytes read",
xorriso->pacifier_count, 0, "", 0); xorriso->pacifier_count, 0, "", 8);
ret= Xorriso_check_for_abort( ret= Xorriso_check_for_abort(
xorriso, xorriso,
xorriso->check_media_default != NULL xorriso->check_media_default != NULL

View File

@ -1 +1 @@
#define Xorriso_timestamP "2012.01.21.114233" #define Xorriso_timestamP "2012.01.21.173229"