diff options
Diffstat (limited to 'src/tool_util.c')
| -rw-r--r-- | src/tool_util.c | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/src/tool_util.c b/src/tool_util.c index 8af15ff0..875411e3 100644 --- a/src/tool_util.c +++ b/src/tool_util.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -27,7 +27,7 @@ #if defined(WIN32) && !defined(MSDOS) -struct timeval tool_tvnow(void) +struct timeval tvnow(void) { /* ** GetTickCount() is available on _all_ Windows versions from W95 up @@ -52,7 +52,7 @@ struct timeval tool_tvnow(void) #elif defined(HAVE_CLOCK_GETTIME_MONOTONIC) -struct timeval tool_tvnow(void) +struct timeval tvnow(void) { /* ** clock_gettime() is granted to be increased monotonically when the @@ -86,7 +86,7 @@ struct timeval tool_tvnow(void) #elif defined(HAVE_GETTIMEOFDAY) -struct timeval tool_tvnow(void) +struct timeval tvnow(void) { /* ** gettimeofday() is not granted to be increased monotonically, due to @@ -100,7 +100,7 @@ struct timeval tool_tvnow(void) #else -struct timeval tool_tvnow(void) +struct timeval tvnow(void) { /* ** time() returns the value of time in seconds since the Epoch. @@ -119,29 +119,8 @@ struct timeval tool_tvnow(void) * * Returns: the time difference in number of milliseconds. */ -long tool_tvdiff(struct timeval newer, struct timeval older) +long tvdiff(struct timeval newer, struct timeval older) { - return (newer.tv_sec-older.tv_sec)*1000+ - (newer.tv_usec-older.tv_usec)/1000; + return (long)(newer.tv_sec-older.tv_sec)*1000+ + (long)(newer.tv_usec-older.tv_usec)/1000; } - -/* - * Same as tool_tvdiff but with full usec resolution. - * - * Returns: the time difference in seconds with subsecond resolution. - */ -double tool_tvdiff_secs(struct timeval newer, struct timeval older) -{ - if(newer.tv_sec != older.tv_sec) - return (double)(newer.tv_sec-older.tv_sec)+ - (double)(newer.tv_usec-older.tv_usec)/1000000.0; - else - return (double)(newer.tv_usec-older.tv_usec)/1000000.0; -} - -/* return the number of seconds in the given input timeval struct */ -long tool_tvlong(struct timeval t1) -{ - return t1.tv_sec; -} - |