diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2020-05-22 10:07:43 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-05-25 12:01:37 +0200 |
| commit | 2bd928a1bff7e39070992df1876b8d9ea9634301 (patch) | |
| tree | c164c9cbdfcdaf0f34d26c34bde81d51dc5dd129 /apps/lib | |
| parent | e91916692724ee7042b17d287dfbb91e20eb6128 (diff) | |
Revert "Guard use of struct tms with #ifdef __TMS"
The __TMS might be necessary on VMS however there is no such
define on glibc even though the times() function is fully
supported.
Fixes #11903
This reverts commit db71d315479762eefbf2bcda8be3b44b1867133f.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11905)
Diffstat (limited to 'apps/lib')
| -rw-r--r-- | apps/lib/apps.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 4337cc6c87..497081c153 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -2270,30 +2270,17 @@ double app_tminterval(int stop, int usertime) double app_tminterval(int stop, int usertime) { double ret = 0; - clock_t now; - static clock_t tmstart; - long int tck = sysconf(_SC_CLK_TCK); -# ifdef __TMS struct tms rus; + clock_t now = times(&rus); + static clock_t tmstart; - 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; } |