search for: msdiff

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

...Tue Sep 5 22:46:43 2000 +++ rsync-2.4.6/util.c Fri Oct 5 09:19:35 2001 @@ -835,28 +835,70 @@ return (int)*s1 - (int)*s2; } -static OFF_T last_ofs; +static OFF_T last_ofs; +static struct timeval print_time; +static struct timeval start_time; +static OFF_T start_ofs; + +static unsigned long msdiff(struct timeval *t1, struct timeval *t2) +{ + return (t2->tv_sec - t1->tv_sec) * 1000 + + (t2->tv_usec - t1->tv_usec) / 1000; +} + +static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now) +{ + int pct = (int)((100.0*ofs)/size); + unsigned long d...

...file_index = -1; } void log_open(void) --- progress.c 13 Jan 2004 05:13:57 -0000 1.5 +++ progress.c 13 Jan 2004 05:00:29 -0000 @@ -21,6 +21,7 @@ #include "rsync.h" +extern struct stats stats; extern int am_server; static OFF_T last_ofs; @@ -45,6 +46,7 @@ static unsigned long msdiff(struct timev static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, int is_last) { + char eol[256]; int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size); unsigned long diff = msdiff(&start_time, now); double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / d...

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

...will be different from the previous run. This is my little improvement (I hope) on progress.c: --- progress.c.orig 2005-03-04 22:58:39.000000000 +0100 +++ progress.c 2005-03-04 23:07:13.000000000 +0100 @@ -68,9 +68,8 @@ if (is_last) { /* Compute stats based on the starting info. */ diff = msdiff(&ph_start.time, now); - if (!diff) - diff = 1; - rate = (double) (ofs - ph_start.ofs) * 1000.0 / diff / 1024.0; + rate = diff ? (double) (ofs - ph_start.ofs) * 1000.0 + / diff / 1024.0 : 0; /* Switch to total time taken for our last update. */ remain = (double) diff / 1000.0;...

..._ofs + 1000)){ gettimeofday(&now, NULL); if (!start_time.tv_sec && !start_time.tv_usec) { start_time.tv_sec = now.tv_sec; start_time.tv_usec = now.tv_usec; start_ofs = ofs; } if((msdiff(&print_time, &now) > 250){ rprint_progress(ofs, size, &now, False); last_ofs = ofs; print_time.tv_sec = now.tv_sec; print_time.tv_usec = now.tv_usec; } } } Disclaimer: I've not tested the...

....c =================================================================== RCS file: /cvsroot/rsync/util.c,v retrieving revision 1.107 diff -u -w -r1.107 util.c --- util.c 23 Feb 2002 00:05:06 -0000 1.107 +++ util.c 14 Mar 2002 09:27:16 -0000 @@ -866,7 +866,9 @@ unsigned long diff = msdiff(&start_time, now); double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0; const char *units; - double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0; + double remain = is_last + ? (double) diff / 1000....