Fix measuring time when a clock experiences a jump

2017-01-11 11:11:52 +01:00 · 2017-01-11 11:11:52 +01:00 · 87b22679c1
commit 87b22679c1
parent 17449033fe
3 changed files with 261 additions and 1 deletions
--- a/time-1.7-Modernize-configure.in.patch
+++ b/time-1.7-Modernize-configure.in.patch
@ -0,0 +1,133 @@
+From 73e60377a708ea6d9e45c981b9b131df4d93e511 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 30 Nov 2016 17:38:37 +0100
+Subject: [PATCH 1/2] Modernize configure.in
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After editting configure.in and running autoreconf with autoconf-2.69
+and automake-1.15, make command failed because configure.in did not
+hook Automake. This patch allows to regenerate the scripts with
+contemporary autotools.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ INSTALL      |  4 ++--
+ configure.ac | 39 +++++++++++++++++++++++++++++++++++++++
+ configure.in | 42 ------------------------------------------
+ 3 files changed, 41 insertions(+), 44 deletions(-)
+ create mode 100644 configure.ac
+ delete mode 100644 configure.in
+
+diff --git a/INSTALL b/INSTALL
+index a2c8722..0cbcb35 100644
+--- a/INSTALL
+++ b/INSTALL
+@@ -19,8 +19,8 @@ diffs or instructions to the address given in the `README' so they can
+ be considered for the next release.  If at some point `config.cache'
+ contains results you don't want to keep, you may remove or edit it.
+ 
+-   The file `configure.in' is used to create `configure' by a program
+-called `autoconf'.  You only need `configure.in' if you want to change
+   The file `configure.ac' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.ac' if you want to change
+ it or regenerate `configure' using a newer version of `autoconf'.
+ 
+ The simplest way to compile this package is:
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..2380b76
+--- /dev/null
+++ b/configure.ac
+@@ -0,0 +1,39 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT([time], [1.7])
+AM_INIT_AUTOMAKE()
+
+AC_ARG_PROGRAM
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
+
+AC_MSG_CHECKING(for struct timeval in sys/time.h)
+AC_EGREP_HEADER(tv_usec, sys/time.h, have_tv=yes, have_tv=no)
+AC_MSG_RESULT($have_tv)
+test $have_tv = yes && AC_DEFINE(HAVE_TIMEVAL)
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_FUNC_WAIT3
+AC_CHECK_FUNCS(strerror)
+
+AC_MSG_CHECKING(for getpagesize)
+AC_TRY_LINK([#include <sys/param.h>],
+[getpagesize();], have_gp=yes, have_gp=no)
+AC_MSG_RESULT($have_gp)
+test $have_gp = yes && AC_DEFINE(HAVE_GETPAGESIZE)
+
+AC_OUTPUT(Makefile)
+diff --git a/configure.in b/configure.in
+deleted file mode 100644
+index 1531bad..0000000
+--- a/configure.in
+++ /dev/null
+@@ -1,42 +0,0 @@
+-dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(time.c)
+-VERSION=1.7
+-AC_SUBST(VERSION)
+-PACKAGE=time
+-AC_SUBST(PACKAGE)
+-
+-AC_ARG_PROGRAM
+-
+-dnl Checks for programs.
+-AC_PROG_CC
+-AC_PROG_CPP
+-AC_PROG_INSTALL
+-
+-dnl Checks for header files.
+-AC_HEADER_STDC
+-AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h)
+-
+-dnl Checks for typedefs, structures, and compiler characteristics.
+-AC_C_CONST
+-AC_TYPE_PID_T
+-AC_TYPE_SIZE_T
+-AC_TYPE_SIGNAL
+-
+-AC_MSG_CHECKING(for struct timeval in sys/time.h)
+-AC_EGREP_HEADER(tv_usec, sys/time.h, have_tv=yes, have_tv=no)
+-AC_MSG_RESULT($have_tv)
+-test $have_tv = yes && AC_DEFINE(HAVE_TIMEVAL)
+-
+-dnl Checks for library functions.
+-AC_FUNC_VPRINTF
+-AC_FUNC_WAIT3
+-AC_CHECK_FUNCS(strerror)
+-
+-AC_MSG_CHECKING(for getpagesize)
+-AC_TRY_LINK([#include <sys/param.h>],
+-[getpagesize();], have_gp=yes, have_gp=no)
+-AC_MSG_RESULT($have_gp)
+-test $have_gp = yes && AC_DEFINE(HAVE_GETPAGESIZE)
+-
+-AC_OUTPUT(Makefile)
+-- 
+2.7.4
+
--- a/time-1.7-Prefer-clock_gettime-CLOCK_MONOTONIC.patch
+++ b/time-1.7-Prefer-clock_gettime-CLOCK_MONOTONIC.patch
@ -0,0 +1,106 @@
+From 56525d640d63da8710d97503ebc0ef6279afcb54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 30 Nov 2016 17:13:16 +0100
+Subject: [PATCH 2/2] Prefer clock_gettime(CLOCK_MONOTONIC)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gettimeofday() reports wrong elapsed real time if a time step was
+inserted while running a program. This can happen on initial time
+adjustment from NTP server or by manual adjustement by date command.
+
+This patch uses clock_gettime(CLOCK_MONOTONIC) instead (if available)
+that does not suffer from the issue.
+
+<http://lists.gnu.org/archive/html/bug-gnu-utils/2013-09/msg00008.html>
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ configure.ac |  1 +
+ resuse.c     | 27 +++++++++++++++++++++++++--
+ 2 files changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2380b76..658a254 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -29,6 +29,7 @@ dnl Checks for library functions.
+ AC_FUNC_VPRINTF
+ AC_FUNC_WAIT3
+ AC_CHECK_FUNCS(strerror)
+AC_CHECK_FUNCS(clock_gettime)
+ 
+ AC_MSG_CHECKING(for getpagesize)
+ AC_TRY_LINK([#include <sys/param.h>],
+diff --git a/resuse.c b/resuse.c
+index 4133941..da0da64 100644
+--- a/resuse.c
+++ b/resuse.c
+@@ -23,7 +23,14 @@
+ #include "wait.h"
+ #include "port.h"
+ 
+-#if !HAVE_WAIT3
+#if HAVE_WAIT3
+# if HAVE_CLOCK_GETTIME
+#  ifndef _POSIX_C_SOURCE
+#   define _POSIX_C_SOURCE 199309L
+#  endif
+#  include <time.h>
+# endif
+#else
+ # include <sys/times.h>
+ # ifndef HZ
+ #  include <sys/param.h>
+@@ -48,7 +55,14 @@ resuse_start (resp)
+      RESUSE *resp;
+ {
+ #if HAVE_WAIT3
+#if HAVE_CLOCK_GETTIME
+  struct timespec res;
+  clock_gettime(CLOCK_MONOTONIC, &res);
+  resp->start.tv_sec = res.tv_sec;
+  resp->start.tv_usec = res.tv_nsec / 1000;
+#else
+   gettimeofday (&resp->start, (struct timezone *) 0);
+#endif /* !HAVE_CLOCK_GETTIME */
+ #else
+   long value;
+   struct tms tms;
+@@ -56,7 +70,7 @@ resuse_start (resp)
+   value = times (&tms);
+   resp->start.tv_sec = value / HZ;
+   resp->start.tv_usec = value % HZ * (1000000 / HZ);
+-#endif
+#endif /* !HAVE_WAIT3 */
+ }
+ 
+ /* Wait for and fill in data on child process PID.
+@@ -76,6 +90,9 @@ resuse_end (pid, resp)
+   int status;
+ 
+ #if HAVE_WAIT3
+#if HAVE_CLOCK_GETTIME
+  struct timespec res;
+#endif
+   pid_t caught;
+ 
+   /* Ignore signals, but don't ignore the children.  When wait3
+@@ -86,7 +103,13 @@ resuse_end (pid, resp)
+ 	return 0;
+     }
+ 
+#if HAVE_CLOCK_GETTIME
+  clock_gettime(CLOCK_MONOTONIC, &res);
+  resp->elapsed.tv_sec = res.tv_sec;
+  resp->elapsed.tv_usec = res.tv_nsec / 1000;
+#else
+   gettimeofday (&resp->elapsed, (struct timezone *) 0);
+#endif
+ #else  /* !HAVE_WAIT3 */
+   long value;
+   struct tms tms;
+-- 
+2.7.4
+
--- a/time.spec
+++ b/time.spec
@ -1,7 +1,7 @@
 Summary: A GNU utility for monitoring a program's use of system resources
 Name: time
 Version: 1.7
-Release: 49%{?dist}
+Release: 50%{?dist}
 License: GPLv2+
 Group: Applications/System
 Url: http://www.gnu.org/software/time/
@ -12,6 +12,19 @@ Patch1: time-1.7-verbose.patch
 Patch2: time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch
 # Bug #527276
 Patch3: time-1.7-Recompute-CPU-usage-at-microsecond-level.patch
+# 1/2 Fix measuring time when a clock experiences a jump, bug #1004416,
+# <http://lists.gnu.org/archive/html/bug-gnu-utils/2013-09/msg00003.html>
+Patch4: time-1.7-Modernize-configure.in.patch
+# 2/2 Fix measuring time when a clock experiences a jump, bug #1004416,
+# <http://lists.gnu.org/archive/html/bug-gnu-utils/2013-09/msg00003.html>
+Patch5: time-1.7-Prefer-clock_gettime-CLOCK_MONOTONIC.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  bash
+BuildRequires:  coreutils
+BuildRequires:  gcc
+BuildRequires:  make
+BuildRequires:  texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info

@ -26,6 +39,9 @@ the results.
 %patch1 -p1
 %patch2 -p1 -b .ru_maxrss
 %patch3 -p1 -b .recompute_cpu
+%patch4 -p1
+%patch5 -p1
+autoreconf -fi

 %build
 echo "ac_cv_func_wait3=\${ac_cv_func_wait3='yes'}" >> config.cache
@ -34,6 +50,8 @@ make %{?_smp_mflags}

 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+# Remove info index, we update it in %%post script
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir

 %post
 /sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \
@ -51,6 +69,9 @@ fi
 %{_infodir}/time.info*

 %changelog
+* Wed Jan 11 2017 Petr Pisar <ppisar@redhat.com> - 1.7-50
+- Fix measuring time when a clock experiences a jump (bug #1004416)
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-49
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild