From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Thu, 7 May 2020 19:37:28 +0000 (+0200)
Subject: Guard use of struct tms with #ifdef __TMS like done earlier in apps/lib/apps.c
X-Git-Tag: openssl-3.0.0-alpha3~105
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db71d315479762eefbf2bcda8be3b44b1867133f;p=oweals%2Fopenssl.git

Guard use of struct tms with #ifdef __TMS like done earlier in apps/lib/apps.c

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11755)
---

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;
     }