From db71d315479762eefbf2bcda8be3b44b1867133f Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Thu, 7 May 2020 21:37:28 +0200 Subject: [PATCH] Guard use of struct tms with #ifdef __TMS like done earlier in apps/lib/apps.c Reviewed-by: Richard Levitte Reviewed-by: David von Oheimb (Merged from https://github.com/openssl/openssl/pull/11755) --- apps/lib/apps.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 6facdf3e5b..4b7201166c 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -2320,17 +2320,30 @@ double app_tminterval(int stop, int usertime) double app_tminterval(int stop, int usertime) { double ret = 0; - struct tms rus; - clock_t now = times(&rus); + clock_t now; static clock_t tmstart; + long int tck = sysconf(_SC_CLK_TCK); +# ifdef __TMS + struct tms rus; + now = times(&rus); if (usertime) now = rus.tms_utime; +# else + if (usertime) + now = clock(); /* sum of user and kernel times */ + else { + struct timeval tv; + gettimeofday(&tv, NULL); + now = (clock_t)((unsigned long long)tv.tv_sec * tck + + (unsigned long long)tv.tv_usec * (1000000 / tck) + ); + } +# endif if (stop == TM_START) { tmstart = now; } else { - long int tck = sysconf(_SC_CLK_TCK); ret = (now - tmstart) / (double)tck; } -- 2.25.1