tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 08:44:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Remove get_current_time() and replace with calls to
monotime_double() which uses CLOCK_MONOTONIC and works over clock steps.  "I
like" markus@

OpenBSD-Commit-ID: 3ad2f7d2414e2cfcaef99877a7a5b0baf2242952
This commit is contained in:
dtucker@openbsd.org@openbsd.org 2017-11-25 05:58:47 +00:00 committed by Damien Miller
parent ba460acae4
commit 2d638e9860
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.306 2017/10/23 05:08:00 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.307 2017/11/25 05:58:47 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -225,19 +225,6 @@ signal_handler(int sig)
quit_pending = 1; quit_pending = 1;
} }
/*
* Returns current time in seconds from Jan 1, 1970 with the maximum
* available resolution.
*/
static double
get_current_time(void)
{
struct timeval tv;
gettimeofday(&tv, NULL);
return (double) tv.tv_sec + (double) tv.tv_usec / 1000000.0;
}
/* /*
* Sets control_persist_exit_time to the absolute time when the * Sets control_persist_exit_time to the absolute time when the
* backgrounded control master should exit due to expiry of the * backgrounded control master should exit due to expiry of the
@ -1256,7 +1243,7 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
fatal("%s pledge(): %s", __func__, strerror(errno)); fatal("%s pledge(): %s", __func__, strerror(errno));
} }
start_time = get_current_time(); start_time = monotime_double();
/* Initialize variables. */ /* Initialize variables. */
last_was_cr = 1; last_was_cr = 1;
@ -1445,7 +1432,7 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
buffer_free(&stderr_buffer); buffer_free(&stderr_buffer);
/* Report bytes transferred, and transfer rates. */ /* Report bytes transferred, and transfer rates. */
total_time = get_current_time() - start_time; total_time = monotime_double() - start_time;
packet_get_bytes(&ibytes, &obytes); packet_get_bytes(&ibytes, &obytes);
verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds", verbose("Transferred: sent %llu, received %llu bytes, in %.1f seconds",
(unsigned long long)obytes, (unsigned long long)ibytes, total_time); (unsigned long long)obytes, (unsigned long long)ibytes, total_time);