Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
40c0289
)
Improved estimation algorithm for time-to-complete.
author
Martin Pool
<mbp@samba.org>
Sun, 2 Dec 2001 13:07:07 +0000
(13:07 +0000)
committer
Martin Pool
<mbp@samba.org>
Sun, 2 Dec 2001 13:07:07 +0000
(13:07 +0000)
util.c
patch
|
blob
|
blame
|
history
diff --git
a/util.c
b/util.c
index
049d005
..
2b4904d
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-824,6
+824,8
@@
static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
/**
/**
+ * @param ofs Current position in file
+ * @param size Total size of file
* @param is_last True if this is the last time progress will be
* printed for this file, so we should output a newline. (Not
* necessarily the same as all bytes being received.)
* @param is_last True if this is the last time progress will be
* printed for this file, so we should output a newline. (Not
* necessarily the same as all bytes being received.)
@@
-835,7
+837,7
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
unsigned long diff = msdiff(&start_time, now);
double rate = diff ? ((ofs-start_ofs) / diff) * 1000.0/1024.0 : 0;
const char *units, *rem_units;
unsigned long diff = msdiff(&start_time, now);
double rate = diff ? ((ofs-start_ofs) / diff) * 1000.0/1024.0 : 0;
const char *units, *rem_units;
- double remain =
pct ? ((100.0-pct) * diff / pct / 1000.0) :
0;
+ double remain =
rate ? (size-ofs) / rate : 0.
0;
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
@@
-857,7
+859,7
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
rem_units = "s";
}
rem_units = "s";
}
- rprintf(FINFO, "%12.0f %3d%% %7.2f%s %
5
.0f%s%s",
+ rprintf(FINFO, "%12.0f %3d%% %7.2f%s %
6
.0f%s%s",
(double) ofs, pct, rate, units,
remain, rem_units,
is_last ? "\n" : "\r");
(double) ofs, pct, rate, units,
remain, rem_units,
is_last ? "\n" : "\r");