search for: end_progress

...) rprintf(FINFO, " %7.2fGB/s", rate/1024.0/1024.0); + else if (rate > 1024) rprintf(FINFO, " %7.2fMB/s", rate/1024.0); + else rprintf(FINFO, " %7.2fKB/s", rate); + + rprintf(FINFO, (pct == 100) ? "\n" : "\r"); +} void end_progress(OFF_T size) { extern int do_progress, am_server; if (do_progress && !am_server) { - rprintf(FINFO,"%.0f (100%%)\n", (double)size); + struct timeval now; + gettimeofday(&now, NULL); + rprint_progress(size, size, &now); } - las...

..._transferred_files, todo); + } else + strcpy(eol, "\r"); rprintf(FINFO, "%12.0f %3d%% %7.2f%s %4d:%02d:%02d%s", (double) ofs, pct, rate, units, - remain_h, remain_m, remain_s, - is_last ? "\n" : "\r"); + remain_h, remain_m, remain_s, eol); } void end_progress(OFF_T size) --- receiver.c 8 Jan 2004 00:45:41 -0000 1.61 +++ receiver.c 13 Jan 2004 06:19:41 -0000 @@ -328,6 +328,9 @@ int recv_files(int f_in,struct file_list file = flist->files[i]; + if (phase == 0) + stats.num_untransferred_files += i - stats.current_file_index - 1; + stats.curre...

...ke 0:-1:-49 */ + rprintf(FCLIENT, "%12s %3d%% %7.2f%s ??:??:??%s", + human_num(ofs), pct, rate, units, + eol); + else + rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s", + human_num(ofs), pct, rate, units, + remain_h, remain_m, remain_s, eol); } void end_progress(OFF_T size)

...finishing reading an origin fd in the sender. --- sender.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sender.c b/sender.c index 59dae7d..a934bfe 100644 --- a/sender.c +++ b/sender.c @@ -338,6 +338,12 @@ void send_files(int f_in, int f_out) if (do_progress) end_progress(st.st_size); + if (do_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) != 0) { + rsyserr(FERROR_XFER, errno, + "fadvise failed in sending %s", + full_fname(fname)); + } + log_item...

Hi, I've read through the rsync manpage, this mailing list, asked Google and studied lots of posts on stackexchange.com (stackoverflow, superuser...), askubuntu.com and some others, concerning rsync's capabilities of showing progress information. But all I've found was what I already knew: --progress (or -P) shows a progress information for *every* file transmitted, --info=progress2

While going through an old todo list I found that these patches had fallen by the way-side. About a year ago I initiated a discussion[1] with the Linux kernel folks regarding the lack of any useable fadvise support on the kernel side. As a result, I was observing extremely poor performance on my server after backup as executable pages were being swapped out in favor of data waiting to be flushed

Skipped content of type multipart/mixed-------------- next part -------------- A non-text attachment was scrubbed... Name: PGP.sig Type: application/pgp-signature Size: 186 bytes Desc: This is a digitally signed message part Url : http://lists.samba.org/archive/rsync/attachments/20040227/923b87ee/PGP.bin

...set = 0; + while (offset < st.st_size) { + read_buf(local_socket, (char *)&offset, sizeof(offset)); + if (offset < 0) + break; + if (do_progress) + show_progress(offset, st.st_size); + } + } + else + match_sums(f_xfer, s, mbuf, st.st_size); if (do_progress) end_progress(st.st_size); diff -au rsync-3.0.6/token.c rsync-3.0.6.fast/token.c --- rsync-3.0.6/token.c 2009-01-17 23:41:35.000000000 +0200 +++ rsync-3.0.6.fast/token.c 2009-09-23 13:33:17.000000000 +0300 @@ -212,7 +212,7 @@ /* non-compressing recv token */ static int32 simple_recv_token(int f, char **data)...

...fd,0,SEEK_CUR), (offset+len), i); + exit_cleanup(RERR_FILEIO); + } } offset += len; } flush_write_file(fd); + if (inplace) + ftruncate(fd, offset); + if (do_progress) end_progress(total_size); @@ -410,39 +424,52 @@ } else mapbuf = NULL; - if (!get_tmpname(fnametmp,fname)) { - if (mapbuf) unmap_file(mapbuf); - if (fd1 != -1) close(fd1); - continue; - } - -...

...ing(void); void write_int(int f,int32 x); diff -bur rsync/receiver.c rsync-craig/receiver.c --- rsync/receiver.c Tue May 28 08:42:51 2002 +++ rsync-craig/receiver.c Sat Dec 7 22:09:04 2002 @@ -273,6 +273,11 @@ offset += len; } + /* + * do a write flush + */ + write_file(fd, NULL, 0); + end_progress(total_size); if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {

...1,8 @@ pid_t piped_child(char **command, int *f_in, int *f_out); pid_t local_child(int argc, char **argv,int *f_in,int *f_out, int (*child_main)(int, char*[])); +pid_t run_filter(char *command[], int in, int *pipe_to_filter); +pid_t run_filter_on_file(char *command[], int out, int in); void end_progress(OFF_T size); void show_progress(OFF_T ofs, OFF_T size); void delete_files(struct file_list *flist); diff -ur rsync-2.5.6/receiver.c rsync-2.5.6-filtered/receiver.c --- rsync-2.5.6/receiver.c 2003-01-21 00:32:17.000000000 +0100 +++ rsync-2.5.6-filtered/receiver.c 2003-11-16 11:44:14.000000000 +010...

...); + } } - if (fd != -1 && write_file(fd,map,len) != (int) len) { - rprintf(FERROR,"write failed on %s : %s\n", - fname,strerror(errno)); - exit_cleanup(RERR_FILEIO); - } offset += len; } + rprintf(FINFO, "#ET#<receive_data: got 0 token\n"); end_progress(total_size); if (fd != -1 && offset > 0 && sparse_end(fd) != 0) { rprintf(FERROR,"write failed on %s : %s\n", @@ -347,8 +356,10 @@ file = flist->files[i]; fname = f_name(file); + rprintf(FINFO, "#ET#<recv_files: handling %s\n", fname);...