X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcrypt_reencrypt.c;h=3154d59fb5e8a97ad28dc999095ee8729283215d;hb=8984e4741407b0bcf19ece1860ceeba09d183b93;hp=9ac5266c07badde566be6f4618b67f4123018d70;hpb=491e79db4c0c590cbd77fb07bc6380ea3b839ed2;p=platform%2Fupstream%2Fcryptsetup.git

diff --git a/src/crypt_reencrypt.c b/src/crypt_reencrypt.c
index 9ac5266..3154d59 100644
--- a/src/crypt_reencrypt.c
+++ b/src/crypt_reencrypt.c
@@ -564,9 +564,9 @@ static int restore_luks_header(struct reenc_ctx *rc)
 
 static void print_progress(struct reenc_ctx *rc, uint64_t bytes, int final)
 {
-	uint64_t mbytes = (bytes - rc->restart_bytes) / 1024 / 1024;
+	unsigned long long mbytes, eta;
 	struct timeval now_time;
-	double tdiff;
+	double tdiff, mib;
 
 	gettimeofday(&now_time, NULL);
 	if (!final && time_diff(rc->end_time, now_time) < 0.5)
@@ -581,13 +581,19 @@ static void print_progress(struct reenc_ctx *rc, uint64_t bytes, int final)
 	if (!tdiff)
 		return;
 
+	mbytes = (bytes - rc->restart_bytes) / 1024 / 1024;
+	mib = (double)(mbytes) / tdiff;
+	if (!mib)
+		return;
+
+	eta = (unsigned long long)(rc->device_size / 1024 / 1024 / mib - tdiff);
+
 	/* vt100 code clear line */
 	log_err("\33[2K\r");
-	log_err(_("Progress: %5.1f%%, time elapsed %4.0f seconds, "
+	log_err(_("Progress: %5.1f%%, ETA %02llu:%02llu, "
 		"%4llu MiB written, speed %5.1f MiB/s%s"),
 		(double)bytes / rc->device_size * 100,
-		time_diff(rc->start_time, rc->end_time),
-		(unsigned long long)mbytes, (double)(mbytes) / tdiff,
+		eta / 60, eta % 60, mbytes, mib,
 		final ? "\n" :"");
 }