From 39d54f53c5193a75023fc870449caf64192e3183 Mon Sep 17 00:00:00 2001 From: jca <> Date: Fri, 24 Nov 2017 13:48:12 +0000 Subject: Use clock_gettime and getrusage to compute real and user time. Better handling of clock jumps, from Scott Cheloa. --- src/usr.bin/openssl/apps_posix.c | 49 +++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 16 deletions(-) (limited to 'src/usr.bin/openssl/apps_posix.c') diff --git a/src/usr.bin/openssl/apps_posix.c b/src/usr.bin/openssl/apps_posix.c index 67cd465088..94c6d35f71 100644 --- a/src/usr.bin/openssl/apps_posix.c +++ b/src/usr.bin/openssl/apps_posix.c @@ -116,31 +116,48 @@ * Functions that need to be overridden by non-POSIX operating systems. */ -#include +#include +#include -#include +#include #include "apps.h" -double -app_tminterval(int stop, int usertime) +static double +real_interval(int stop) { - double ret = 0; - struct tms rus; - clock_t now = times(&rus); - static clock_t tmstart; + static struct timespec start; + struct timespec elapsed, now; + + clock_gettime(CLOCK_MONOTONIC, &now); + if (stop) { + timespecsub(&now, &start, &elapsed); + return elapsed.tv_sec + elapsed.tv_nsec / 1000000000.0; + } + start = now; + return 0.0; +} - if (usertime) - now = rus.tms_utime; +static double +user_interval(int stop) +{ + static struct timeval start; + struct timeval elapsed; + struct rusage now; - if (stop == TM_START) - tmstart = now; - else { - long int tck = sysconf(_SC_CLK_TCK); - ret = (now - tmstart) / (double) tck; + getrusage(RUSAGE_SELF, &now); + if (stop) { + timersub(&now.ru_utime, &start, &elapsed); + return elapsed.tv_sec + elapsed.tv_usec / 1000000.0; } + start = now.ru_utime; + return 0.0; +} - return (ret); +double +app_tminterval(int stop, int usertime) +{ + return (usertime) ? user_interval(stop) : real_interval(stop); } int -- cgit v1.2.3-55-g6feb