diff options
author | Wayne Davison <wayned@samba.org> | 2007-12-08 11:39:03 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-12-08 11:39:47 -0800 |
commit | 65b4e4b2a93de8e5bff93b5c7a2a529613cbc5e8 (patch) | |
tree | ffd109f2b665ee86fd49e330f91ded839cc0b887 /progress.c | |
parent | 37adeae73e9e590082d1247eeb8f216db18b24dc (diff) | |
download | android_external_rsync-65b4e4b2a93de8e5bff93b5c7a2a529613cbc5e8.tar.gz android_external_rsync-65b4e4b2a93de8e5bff93b5c7a2a529613cbc5e8.tar.bz2 android_external_rsync-65b4e4b2a93de8e5bff93b5c7a2a529613cbc5e8.zip |
Updated indexing for accurate progress and improved raw ndx values.
The sending side now has a sorted file-list in iconv mode so that it
can output progress in sorted order. Simplified the over-the-wire
index values to ensure both sides will always agree on the values.
Optimized the allocation of the dir_flist->sorted array on the
receiving side with --iconv and incremental recursion.
Diffstat (limited to 'progress.c')
-rw-r--r-- | progress.c | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -22,8 +22,10 @@ #include "rsync.h" -extern struct stats stats; extern int am_server; +extern int need_unsorted_flist; +extern struct stats stats; +extern struct file_list *cur_flist; #define PROGRESS_HISTORY_SECS 5 @@ -41,6 +43,7 @@ struct progress_history { static struct progress_history ph_start; static struct progress_history ph_list[PROGRESS_HISTORY_SECS]; static int newest_hpos, oldest_hpos; +static int current_file_index; static unsigned long msdiff(struct timeval *t1, struct timeval *t2) { @@ -104,7 +107,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, if (is_last) { snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n", stats.num_transferred_files, - stats.num_files - stats.current_file_index - 1, + stats.num_files - current_file_index - 1, stats.num_files); } else strlcpy(eol, "\r", sizeof eol); @@ -112,6 +115,15 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, human_num(ofs), pct, rate, units, rembuf, eol); } +void set_current_file_index(struct file_struct *file, int ndx) +{ + if (need_unsorted_flist) + current_file_index = flist_find(cur_flist, file) + cur_flist->ndx_start; + else + current_file_index = ndx; + current_file_index -= cur_flist->flist_num; +} + void end_progress(OFF_T size) { if (!am_server) { |