From 746549dde985f8e7b05fb88d2842962be421c69d Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 27 Oct 2019 22:58:26 +0100
Subject: [PATCH] Retrieve the real time through gettimeofday(), not times().

---
 configure.ac                      |  2 --
 m4/times.m4                       | 49 -------------------------------
 src/base/cl_base_config.h.in      |  5 ----
 src/base/random/cl_random_from.cc | 18 ------------
 src/timing/cl_t_config.h.in       |  5 ----
 5 files changed, 79 deletions(-)
 delete mode 100644 m4/times.m4

diff --git a/configure.ac b/configure.ac
index 8a81007..a9dfb26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,8 +113,6 @@ CL_GETTIMEOFDAY
                       dnl DEFS HAVE_GETTIMEOFDAY, GETTIMEOFDAY_DOTS, GETTIMEOFDAY_TZP_T
 ac_cv_func_ftime=no
                       dnl don't use ftime(3) even if it's available
-CL_TIMES_CLOCK
-                      dnl DEFS HAVE_TIMES_CLOCK
 CL_RUSAGE
                       dnl DEFS HAVE_SYS_RESOURCE_H, HAVE_GETRUSAGE, HAVE_SYS_TIMES_H
 CL_PERROR
diff --git a/m4/times.m4 b/m4/times.m4
deleted file mode 100644
index d0d2b0e..0000000
--- a/m4/times.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-dnl -*- Autoconf -*-
-dnl Copyright (C) 1993-2006 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible, Marcus Daniels, Sam Steingold.
-
-AC_PREREQ(2.57)
-
-AC_DEFUN([CL_TIMES_CLOCK],
-[AC_REQUIRE([CL_GETTIMEOFDAY])dnl
-if test $ac_cv_func_gettimeofday = no -a $ac_cv_func_ftime = no; then
-AC_CHECK_FUNC(times, , no_times=1)dnl
-if test -z "$no_times"; then
-AC_CACHE_CHECK(for times return value, cl_cv_func_times_return, [
-AC_TRY_RUN([
-#include <stdlib.h> /* needed for exit() */
-#include <sys/types.h>
-#include <time.h> /* needed for CLK_TCK */
-#ifndef CLK_TCK
-#include <sys/time.h> /* needed for CLK_TCK on SYSV PTX */
-#endif
-#include <sys/times.h>
-int main ()
-{ struct tms buffer;
-  clock_t result1;
-  clock_t result2;
-  int ticks;
-  result1 = times(&buffer);
-  if ((result1 == (clock_t)0) || (result1 == (clock_t)(-1))) exit(1);
-  sleep(1);
-  result2 = times(&buffer);
-  if ((result2 == (clock_t)0) || (result2 == (clock_t)(-1))) exit(1);
-  ticks = result2 - result1;
-  exit(!((ticks >= CLK_TCK/2) && (ticks <= 3*CLK_TCK/2)));
-}], cl_cv_func_times_return=yes, cl_cv_func_times_return=no,
-dnl When cross-compiling, don't assume anything.
-cl_cv_func_times_return="guessing no")
-])
-case "$cl_cv_func_times_return" in
-  *yes) AC_DEFINE(HAVE_TIMES_CLOCK,,[have the times() function and it returns the real time, but do not have the gettimeofday() or ftime() function]) ;;
-  *no)  ;;
-esac
-fi
-fi
-])
diff --git a/src/base/cl_base_config.h.in b/src/base/cl_base_config.h.in
index f4c9b7c..a04f859 100644
--- a/src/base/cl_base_config.h.in
+++ b/src/base/cl_base_config.h.in
@@ -16,11 +16,6 @@
 /* Define as the type of `tzp' in gettimeofday() declaration. */
 #undef GETTIMEOFDAY_TZP_T
 
-/* CL_TIMES_CLOCK */
-/* Define if you have the times() function and it returns the real time,
-   but don't have the gettimeofday() function. */
-#undef HAVE_TIMES_CLOCK
-
 
 #endif /* _CL_BASE_CONFIG_H */
 
diff --git a/src/base/random/cl_random_from.cc b/src/base/random/cl_random_from.cc
index d187f47..53bc305 100644
--- a/src/base/random/cl_random_from.cc
+++ b/src/base/random/cl_random_from.cc
@@ -41,24 +41,6 @@ inline uint32 get_seed (void)
 }
 }  // namespace cln
 
-#elif defined(HAVE_TIMES_CLOCK)
-
-#include <ctime>
-#ifndef CLK_TCK
-#include <sys/time.h>
-#endif
-#include <sys/times.h>
-extern "C" clock_t times (struct tms * buffer);
-
-namespace cln {
-inline uint32 get_seed (void)
-{
-	var struct tms tmsbuf;
-	var uint32 seed_lo = times(&tmsbuf);
-	return seed_lo + tmsbuf.tms_utime + tmsbuf.tms_stime;
-}
-}  // namespace cln
-
 #endif
 
 #elif defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/src/timing/cl_t_config.h.in b/src/timing/cl_t_config.h.in
index a1a0fa1..aa4acec 100644
--- a/src/timing/cl_t_config.h.in
+++ b/src/timing/cl_t_config.h.in
@@ -16,11 +16,6 @@
 /* Define as the type of `tzp' in gettimeofday() declaration. */
 #undef GETTIMEOFDAY_TZP_T
 
-/* CL_TIMES_CLOCK */
-/* Define if you have the times() function and it returns the real time,
-   but don't have the gettimeofday() function. */
-#undef HAVE_TIMES_CLOCK
-
 /* CL_RUSAGE */
 /* Define if you have <sys/resource.h>. */
 #undef HAVE_SYS_RESOURCE_H
-- 
2.45.2