search for: do_progress

...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); } - last_ofs = 0; + last_ofs = 0; + st...

...------ next part -------------- --- rsync-2.6.0/flist.c.orig 2004-01-06 16:16:09.000000000 +0100 +++ rsync-2.6.0/flist.c 2004-01-06 16:30:15.000000000 +0100 @@ -76,15 +76,12 @@ static int show_filelist_p(void) { - return verbose && (recurse || files_from) && !am_server; + return do_progress && verbose && (recurse || files_from) && !am_server; } static void start_filelist_progress(char *kind) { - rprintf(FINFO, "%s ... ", kind); - if ((verbose > 1) || do_progress) - rprintf(FINFO, "\n"); - rflush(FINFO); + rprintf(FINFO, "%s ......

...ot;daemon", 0, POPT_ARG_NONE, &am_daemon, 0, 0, 0 }, {"no-detach", 0, POPT_ARG_NONE, &no_detach, 0, 0, 0 }, {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, - {"progress", 0, POPT_ARG_NONE, &do_progress, 0, 0, 0 }, + {"progress", 0, POPT_ARG_NONE, 0, OPT_PROGRESS, 0, 0 }, {"partial", 0, POPT_ARG_NONE, &keep_partial, 0, 0, 0 }, {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, {"blocking-io",...

...option so "--report=file,dir,stats,progress" would be the near equivalent of "-v --stats --progress". For backward compatability and because -v is intuitive the existing options would be preserved and mapped into the bitmasks. INTERNAL USAGE The use of verbose, do_stats and do_progress are replaced with two bitmasks: report_flags and debug_flags. Two bitmasks were chosen because debugging and verbosity should be considered separate issues. To facilitate using these two macros are created. Everywhere you have something like "if (verbose)" or "if (verbose >= n)...

Hi, I have question about the behavior of --backup-dir with --delete-after option. In my testing with version 2.6.4, it appears that the backup option only backups altered files. Files that will be deleted on the destination system will NOT be placed in --backup-dir location. I would like to back up deleted files. Is there a way to do this? Thanks

The first patch will make "make install-strip" work. The second spends a few cycles avoiding "1 files to consider." Both are trivial but IMHO useful. --- Makefile.orig Wed Mar 13 06:38:42 2002 +++ Makefile Wed Mar 13 06:40:58 2002 @@ -12,6 +12,7 @@ LDFLAGS= INSTALLCMD=/bin/install -c +INSTALLMAN=/bin/install -c srcdir=. @@ -56,8 +57,8 @@ ${INSTALLCMD} -m 755 rsync

...et, total_size); Then, the show_progress call inside the for loop could be moved at the end of the loop. Note that inside show_progress, I believe that gettimeofday could be called only when ofs==0 or when it's usefull: void show_progress(OFF_T ofs, OFF_T size) { extern int do_progress, am_server; struct timeval now; if((ofs==0)||(do_progress && !am_server && ofs > last_ofs + 1000)){ gettimeofday(&now, NULL); if (!start_time.tv_sec && !start_time.tv_usec) {...

...y) ethernet packets, which means the overhead is quite large on slow network connections. The initial file_list writing is typically buffered, but reading it on the client is not. There are some other unneeded system calls: - One example is that show_progress() calls gettimeofday() even if do_progress is not set. show_progress() is called on every block, so there is an extra system call per (700 byte) block. - Another example is that file_write writes each matching (700 byte) block without buffering, so that's another system call per block. To study this behavior I used rsync-2....

...fname); - match_sums(f_xfer, s, mbuf, st.st_size); + if (local_server && local_socket && s->count == 0) { + OFF_T offset = 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....

...-dropsuid.patch Scott. -------------- next part -------------- diff -r --unified rsync-2.5.4pre1-orig/flist.c rsync-2.5.4pre1/flist.c --- rsync-2.5.4pre1-orig/flist.c Thu Feb 14 05:30:27 2002 +++ rsync-2.5.4pre1/flist.c Tue Mar 12 21:57:27 2002 @@ -36,7 +36,9 @@ extern int verbose; extern int do_progress; extern int am_server; +extern int am_sender; extern int always_checksum; +extern int drop_suid; extern int cvs_exclude; @@ -714,6 +716,10 @@ #ifdef HAVE_STRUCT_STAT_ST_RDEV file->rdev = st.st_rdev; #endif + + if (am_sender && drop_suid && S_ISREG(st.st_mode)) { + fil...

...of the e-mail). Thanks, Mark. diff -Naur rsync-2.6.1pre2/match.c rsync-inplace/match.c --- rsync-2.6.1pre2/match.c 2004-01-04 06:28:03.000000000 +1100 +++ rsync-inplace/match.c 2004-04-21 11:04:31.000000000 +1000 @@ -22,6 +22,7 @@ extern int verbose; extern int am_server; extern int do_progress; +extern int inplace; typedef unsigned short tag; @@ -199,6 +200,10 @@ if (l != s->sums[i].len) continue; + /* if inplace, make sure the offset is greater than where we are */ + if (inplace && (offset > s-&...

...int num_transferred_files; + int num_untransferred_files; + int current_file_index; }; --- sender.c 10 Jan 2004 20:16:18 -0000 1.32 +++ sender.c 13 Jan 2004 06:19:53 -0000 @@ -25,6 +25,7 @@ extern struct stats stats; extern int io_error; extern int dry_run; extern int am_server; +extern int do_progress; /** @@ -155,6 +156,9 @@ void send_files(struct file_list *flist, file = flist->files[i]; + if (phase == 0) + stats.num_untransferred_files += i - stats.current_file_index - 1; + stats.current_file_index = i; stats.num_transferred_files++; stats.total_transferred_size += fi...

Using rsync 2.6.0 with --verbose and doing a pull. >?receiving file list ... readlink "{FILENAME}" failed: >?No such file or directory >?done >?IO error encountered - skipping file deletion The file was a temporary file that was being deleted just as the rsync was run. So while the file list was being built, it was there when the directory was read but had vanished by the

...c-2.6.3/options.c 2004-11-04 12:16:27.408947256 -0200 @@ -769,6 +769,12 @@ } } + if (bwlimit) { + bwlimit_writemax = (size_t)bwlimit * 128; + if (bwlimit_writemax < 512) + bwlimit_writemax = 512; + } + if (daemon_opt) { daemon_opt = 0; am_daemon = 1; @@ -807,12 +813,6 @@ if (do_progress && !verbose) verbose = 1; - if (bwlimit) { - bwlimit_writemax = (size_t)bwlimit * 128; - if (bwlimit_writemax < 512) - bwlimit_writemax = 512; - } - if (inplace) { #if HAVE_FTRUNCATE if (partial_dir) { Thanks for your time, -- Marcelo Ricardo Leitner <mrl@conectiva.co...

...0 +++ ./options.c 2005-01-13 08:47:09.292810016 +0000 @@ -769,6 +768,12 @@ } } + if (bwlimit) { + bwlimit_writemax = (size_t)bwlimit * 128; + if (bwlimit_writemax < 512) + bwlimit_writemax = 512; + } + if (daemon_opt) { daemon_opt = 0; am_daemon = 1; @@ -807,11 +812,6 @@ if (do_progress && !verbose) verbose = 1; - if (bwlimit) { - bwlimit_writemax = (size_t)bwlimit * 128; - if (bwlimit_writemax < 512) - bwlimit_writemax = 512; - } if (inplace) {

...dvise hint after 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)); +...

...{ RERR_CMD_RUN , "remote command could not be run" }, diff -Naur rsync-2.6.8/options.c rsync-2.6.8-new/options.c --- rsync-2.6.8/options.c Wed Mar 29 02:09:36 2006 +++ rsync-2.6.8-new/options.c Wed May 24 15:50:43 2006 @@ -93,6 +93,7 @@ int daemon_over_rsh = 0; int do_stats = 0; int do_progress = 0; +int do_timeout = 0; int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; @@ -506,6 +507,7 @@ {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, {&...

Skipped content of type multipart/mixed-------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://lists.samba.org/archive/rsync/attachments/20030728/49616c2f/attachment.bin

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

...ach", 0, POPT_ARG_NONE, &no_detach , 0, 0, 0 }, - {"stats", 0, POPT_ARG_NONE, &do_stats , 0, 0, 0 }, + {"stats", 0, POPT_ARG_NONE, 0, OPT_STATS, 0, 0 }, {"progress", 0, POPT_ARG_NONE, &do_progress , 0, 0, 0 }, {"partial", 0, POPT_ARG_NONE, &keep_partial , 0, 0, 0 }, {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors , 0, 0, 0 }, @@ -555,6 +555,10 @@ if (frommain) quiet++; break; +...