tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
dtucker@openbsd.org 2016-03-02 22:42:40 +00:00 committed by Damien Miller
parent 18f64b969c
commit b8d4eafe29
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.101 2016/01/20 09:22:39 dtucker Exp $ */ /* $OpenBSD: misc.c,v 1.102 2016/03/02 22:42:40 dtucker Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -909,6 +909,17 @@ monotime(void)
return time(NULL); return time(NULL);
} }
double
monotime_double(void)
{
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
fatal("clock_gettime: %s", strerror(errno));
return (ts.tv_sec + (double)ts.tv_nsec / 1000000000);
}
void void
bandwidth_limit_init(struct bwlimit *bw, u_int64_t kbps, size_t buflen) bandwidth_limit_init(struct bwlimit *bw, u_int64_t kbps, size_t buflen)
{ {

3
misc.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.h,v 1.54 2014/07/15 15:54:14 millert Exp $ */ /* $OpenBSD: misc.h,v 1.55 2016/03/02 22:42:40 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -55,6 +55,7 @@ void sanitise_stdfd(void);
void ms_subtract_diff(struct timeval *, int *); void ms_subtract_diff(struct timeval *, int *);
void ms_to_timeval(struct timeval *, int); void ms_to_timeval(struct timeval *, int);
time_t monotime(void); time_t monotime(void);
double monotime_double(void);
void lowercase(char *s); void lowercase(char *s);
int unix_listener(const char *, int, int); int unix_listener(const char *, int, int);

13
progressmeter.c
View File

@ -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. * Copyright (c) 2003 Nils Nordman. All rights reserved.
* *
@ -63,8 +63,8 @@ void refresh_progress_meter(void);
/* signal handler for updating the progress meter */ /* signal handler for updating the progress meter */
static void update_progress_meter(int); static void update_progress_meter(int);
static time_t start; /* start progress */ static double start; /* start progress */
static time_t last_update; /* last progress update */ static double last_update; /* last progress update */
static const char *file; /* name of the file being transferred */ static const char *file; /* name of the file being transferred */
static off_t start_pos; /* initial position of transfer */ static off_t start_pos; /* initial position of transfer */
static off_t end_pos; /* ending position of transfer */ static off_t end_pos; /* ending position of transfer */
@ -120,9 +120,8 @@ void
refresh_progress_meter(void) refresh_progress_meter(void)
{ {
char buf[MAX_WINSIZE + 1]; char buf[MAX_WINSIZE + 1];
time_t now;
off_t transferred; off_t transferred;
double elapsed; double elapsed, now;
int percent; int percent;
off_t bytes_left; off_t bytes_left;
int cur_speed; int cur_speed;
@ -132,7 +131,7 @@ refresh_progress_meter(void)
transferred = *counter - (cur_pos ? cur_pos : start_pos); transferred = *counter - (cur_pos ? cur_pos : start_pos);
cur_pos = *counter; cur_pos = *counter;
now = monotime(); now = monotime_double();
bytes_left = end_pos - cur_pos; bytes_left = end_pos - cur_pos;
if (bytes_left > 0) if (bytes_left > 0)
@ -250,7 +249,7 @@ update_progress_meter(int ignore)
void void
start_progress_meter(const char *f, off_t filesize, off_t *ctr) start_progress_meter(const char *f, off_t filesize, off_t *ctr)
{ {
start = last_update = monotime(); start = last_update = monotime_double();
file = f; file = f;
start_pos = *ctr; start_pos = *ctr;
end_pos = filesize; end_pos = filesize;