diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-03-02 23:42:40 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-03-04 05:12:19 +0100 |
| commit | b8d4eafe29684fe4f5bb587f7eab948e6ed62723 (patch) | |
| tree | 3bdc08a366a144ea37ee94907d62f21fa52d2f53 /progressmeter.c | |
| parent | upstream commit (diff) | |
| download | openssh-b8d4eafe29684fe4f5bb587f7eab948e6ed62723.tar.xz openssh-b8d4eafe29684fe4f5bb587f7eab948e6ed62723.zip | |
upstream commit
Improve precision of progressmeter for sftp and scp by
storing sub-second timestamps. Pointed out by mmcc@, ok deraadt@ markus@
Upstream-ID: 38fd83a3d83dbf81c8ff7b5d1302382fe54970ab
Diffstat (limited to 'progressmeter.c')
| -rw-r--r-- | progressmeter.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/progressmeter.c b/progressmeter.c index 319b7470a..3a455408c 100644 --- a/progressmeter.c +++ b/progressmeter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: progressmeter.c,v 1.41 2015/01/14 13:54:13 djm Exp $ */ +/* $OpenBSD: progressmeter.c,v 1.42 2016/03/02 22:42:40 dtucker Exp $ */ /* * Copyright (c) 2003 Nils Nordman. All rights reserved. * @@ -63,8 +63,8 @@ void refresh_progress_meter(void); /* signal handler for updating the progress meter */ static void update_progress_meter(int); -static time_t start; /* start progress */ -static time_t last_update; /* last progress update */ +static double start; /* start progress */ +static double last_update; /* last progress update */ static const char *file; /* name of the file being transferred */ static off_t start_pos; /* initial position of transfer */ static off_t end_pos; /* ending position of transfer */ @@ -120,9 +120,8 @@ void refresh_progress_meter(void) { char buf[MAX_WINSIZE + 1]; - time_t now; off_t transferred; - double elapsed; + double elapsed, now; int percent; off_t bytes_left; int cur_speed; @@ -132,7 +131,7 @@ refresh_progress_meter(void) transferred = *counter - (cur_pos ? cur_pos : start_pos); cur_pos = *counter; - now = monotime(); + now = monotime_double(); bytes_left = end_pos - cur_pos; if (bytes_left > 0) @@ -250,7 +249,7 @@ update_progress_meter(int ignore) void start_progress_meter(const char *f, off_t filesize, off_t *ctr) { - start = last_update = monotime(); + start = last_update = monotime_double(); file = f; start_pos = *ctr; end_pos = filesize; |