From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 16 Sep 2015 23:15:55 +0000 (+0000)
Subject: Add struct timex.tai support
X-Git-Tag: v4.11~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dbb7acc35a0d37107db286166c3d21e8b27ce44;p=strace

Add struct timex.tai support

* configure.ac (AC_CHECK_MEMBERS): Add struct timex.tai.
* print_timex.c (print_timex) [HAVE_STRUCT_TIMEX_TAI]: Print tai field.
* tests/adjtimex.c (main) [HAVE_STRUCT_TIMEX_TAI]: Likewise.
---

diff --git a/configure.ac b/configure.ac
index 702258a8..334dd6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,6 +332,8 @@ AC_CHECK_MEMBERS([struct sigevent._sigev_un._pad,
 
 AC_CHECK_TYPES([struct flock64],,, [#include <fcntl.h>])
 
+AC_CHECK_MEMBERS([struct timex.tai],,, [#include <sys/timex.h>])
+
 AC_CHECK_HEADERS([linux/input.h], [
 	AC_CHECK_MEMBERS([struct input_absinfo.resolution],,, [#include <linux/input.h>])
 ])
diff --git a/print_timex.c b/print_timex.c
index 10d89403..f961ecf2 100644
--- a/print_timex.c
+++ b/print_timex.c
@@ -66,6 +66,9 @@ MPERS_PRINTER_DECL(int, print_timex)(struct tcb *tcp, const long addr)
 		tx.shift, (intmax_t) tx.stabil, (intmax_t) tx.jitcnt);
 	tprintf(", calcnt=%jd, errcnt=%jd, stbcnt=%jd",
 		(intmax_t) tx.calcnt, (intmax_t) tx.errcnt, (intmax_t) tx.stbcnt);
+#ifdef HAVE_STRUCT_TIMEX_TAI
+	tprintf(", tai=%d", tx.tai);
+#endif
 	tprints("}");
 	return 0;
 }
diff --git a/tests/adjtimex.c b/tests/adjtimex.c
index 3b130b2b..68e298fe 100644
--- a/tests/adjtimex.c
+++ b/tests/adjtimex.c
@@ -46,7 +46,11 @@ main(void)
 	       ", esterror=%jd, status=%s, constant=%jd, precision=%jd"
 	       ", tolerance=%jd, time={%jd, %jd}, tick=%jd, ppsfreq=%jd"
 	       ", jitter=%jd, shift=%d, stabil=%jd, jitcnt=%jd, calcnt=%jd"
-	       ", errcnt=%jd, stbcnt=%jd\\}\\) = %d \\(TIME_[A-Z]+\\)\n",
+	       ", errcnt=%jd, stbcnt=%jd"
+#ifdef HAVE_STRUCT_TIMEX_TAI
+	       ", tai=%d"
+#endif
+	       "\\}\\) = %d \\(TIME_[A-Z]+\\)\n",
 	       (intmax_t) tx.offset,
 	       (intmax_t) tx.freq,
 	       (intmax_t) tx.maxerror,
@@ -66,6 +70,9 @@ main(void)
 	       (intmax_t) tx.calcnt,
 	       (intmax_t) tx.errcnt,
 	       (intmax_t) tx.stbcnt,
+#ifdef HAVE_STRUCT_TIMEX_TAI
+	       tx.tai,
+#endif
 	       state);
 
 	return 0;