nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Use clock_gettime(CLOCK_MONOTONIC) as the Unix getticks(), if it's

Browse Source 
available.

[originally from svn r9529]
This commit is contained in:
Simon Tatham 2012-05-13 15:59:27 +00:00
parent aba05b7180
commit 0395e52bb8
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/configure.ac
View File

@ -119,6 +119,8 @@ AC_CHECK_LIB(X11, XOpenDisplay,
AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])]) AC_DEFINE([HAVE_LIBX11],[],[Define if libX11.a is available])])
AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx]) AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [[#include <time.h>]])
AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Define if clock_gettime() is available])])
AC_OUTPUT AC_OUTPUT

26
unix/uxmisc.c
View File

@ -7,6 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
#include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
@ -15,14 +16,27 @@
unsigned long getticks(void) unsigned long getticks(void)
{ {
struct timeval tv;
gettimeofday(&tv, NULL);
/* /*
* We want to use milliseconds rather than microseconds, * We want to use milliseconds rather than the microseconds or
* because we need a decent number of them to fit into a 32-bit * nanoseconds given by the underlying clock functions, because we
* word so it can be used for keepalives. * need a decent number of them to fit into a 32-bit word so it
* can be used for keepalives.
*/ */
return tv.tv_sec * TICKSPERSEC + tv.tv_usec / (1000000 / TICKSPERSEC); #if defined HAVE_CLOCK_GETTIME && defined HAVE_DECL_CLOCK_MONOTONIC
{
/* Use CLOCK_MONOTONIC if available, so as to be unconfused if
* the system clock changes. */
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
return ts.tv_sec * TICKSPERSEC +
ts.tv_nsec / (1000000 / TICKSPERSEC);
}
#endif
{
struct timeval tv;
gettimeofday(&tv, NULL);
return tv.tv_sec * TICKSPERSEC + tv.tv_usec / (1000000 / TICKSPERSEC);
}
} }
Filename *filename_from_str(const char *str) Filename *filename_from_str(const char *str)