mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-30 01:31:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Also estimate time remaining.

Browse Source
This commit is contained in:
Martin Pool
2001-12-02 08:56:25 +00:00
parent 47f1218d69
commit 62791bdfa2
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
util.c
View File

@@ -831,13 +831,12 @@ 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)
{
int pct = (int)((100.0*ofs)/size);
int pct = (ofs == size) ? 100 : (int)((100.0*ofs)/size);
unsigned long diff = msdiff(&start_time, now);
double rate = diff ? ((ofs-start_ofs) / diff) * 1000.0/1024.0 : 0;
const char *units;
const char *units, *rem_units;
double remain = pct ? ((100.0-pct) * diff / pct / 1000.0) : 0;
if (ofs == size) pct = 100;
if (rate > 1024*1024) {
rate /= 1024.0 * 1024.0;
units = "GB/s";
@@ -847,9 +846,20 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
} else {
units = "kB/s";
}
if (remain > 5*60*60) {
remain /= 60*60;
rem_units = "h";
} if (remain > 5*60) {
remain /= 60;
rem_units = "m";
} else {
rem_units = "s";
}
rprintf(FINFO, "%12.0f %3d%% %7.2f%s%s",
rprintf(FINFO, "%12.0f %3d%% %7.2f%s %5.0f%s%s",
(double) ofs, pct, rate, units,
remain, rem_units,
is_last ? "\n" : "\r");
}