Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean scratch directory between each test run.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
3fd65f4
..
0006b00
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.)
@@
-831,13
+833,13
@@
static unsigned long msdiff(struct timeval *t1, struct timeval *t2)
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
int is_last)
{
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
int is_last)
{
- int pct = (int)((100.0*ofs)/size);
+ int pct = (
ofs == size) ? 100 : (
int)((100.0*ofs)/size);
unsigned long diff = msdiff(&start_time, now);
unsigned long diff = msdiff(&start_time, now);
- double rate = diff ? ((ofs-start_ofs) / diff) * 1000.0/1024.0 : 0;
- const char *units;
+ double rate = diff ? (double) (ofs-start_ofs) * 1000.0 / diff / 1024.0 : 0;
+ const char *units, *rem_units;
+ double remain = rate ? (double) (size-ofs) / rate / 1000.0: 0.0;
+ int remain_h, remain_m, remain_s;
- if (ofs == size) pct = 100;
-
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
units = "GB/s";
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
units = "GB/s";
@@
-847,9
+849,14
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
} else {
units = "kB/s";
}
} else {
units = "kB/s";
}
+
+ remain_s = (int) remain % 60;
+ remain_m = (int) (remain / 60.0) % 60;
+ remain_h = (int) (remain / 3600.0);
- rprintf(FINFO, "%12.0f %3d%% %7.2f%s%s",
+ rprintf(FINFO, "%12.0f %3d%% %7.2f%s
%4d:%02d:%02d
%s",
(double) ofs, pct, rate, units,
(double) ofs, pct, rate, units,
+ remain_h, remain_m, remain_s,
is_last ? "\n" : "\r");
}
is_last ? "\n" : "\r");
}