From patchwork Tue Aug 20 13:21:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 34190 Received: (qmail 9285 invoked by alias); 20 Aug 2019 13:37:00 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 9260 invoked by uid 89); 20 Aug 2019 13:37:00 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=offering, formerly, consolidated X-HELO: l2mail1.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Cc: Joseph Myers , Florian Weimer , Lukasz Majewski , Alistair Francis , Stepan Golosunov , Arnd Bergmann Subject: [PATCH 07/12] Use clock_gettime to implement ftime. Date: Tue, 20 Aug 2019 09:21:47 -0400 Message-Id: <20190820132152.24100-8-zackw@panix.com> In-Reply-To: <20190820132152.24100-1-zackw@panix.com> References: <20190820132152.24100-1-zackw@panix.com> MIME-Version: 1.0 ftime is an obsolete variation on gettimeofday, offering only millisecond time resolution; it was probably a system call in ooold versions of BSD Unix. For historic reasons, we had three implementations of it. These are all consolidated into time/ftime.c. Like gettimeofday, ftime tries to report the time zone, and using that information is always a bug. This patch dummies out the reported timezone information; the ‘timezone’ and ‘dstflag’ fields of the returned ‘struct timeb’ will always be zero. (There is an argument for turning this function into a compat symbol, and not installing sys/timeb.h anymore. Thoughts?) * time/ftime.c (ftime): Replace implementation with the code formerly in sysdeps/unix/bsd/ftime.c, then change that code to use __clock_gettime instead of __gettimeofday. Always set the timezone and dstflag fields of the ‘timebuf’ argument to zero. * sysdeps/unix/bsd/ftime.c * sysdeps/unix/sysv/linux/ftime.c: Delete file. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/bsd/ftime.c | 40 --------------------------------- sysdeps/unix/sysv/linux/ftime.c | 3 --- time/ftime.c | 26 ++++++++++----------- 3 files changed, 12 insertions(+), 57 deletions(-) delete mode 100644 sysdeps/unix/bsd/ftime.c delete mode 100644 sysdeps/unix/sysv/linux/ftime.c diff --git a/sysdeps/unix/bsd/ftime.c b/sysdeps/unix/bsd/ftime.c deleted file mode 100644 index 3a1c6e9b01..0000000000 --- a/sysdeps/unix/bsd/ftime.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 1994-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include - -int -ftime (struct timeb *timebuf) -{ - struct timeval tv; - struct timezone tz; - - if (__gettimeofday (&tv, &tz) < 0) - return -1; - - timebuf->time = tv.tv_sec; - timebuf->millitm = (tv.tv_usec + 500) / 1000; - if (timebuf->millitm == 1000) - { - ++timebuf->time; - timebuf->millitm = 0; - } - timebuf->timezone = tz.tz_minuteswest; - timebuf->dstflag = tz.tz_dsttime; - return 0; -} diff --git a/sysdeps/unix/sysv/linux/ftime.c b/sysdeps/unix/sysv/linux/ftime.c deleted file mode 100644 index 5a5949f608..0000000000 --- a/sysdeps/unix/sysv/linux/ftime.c +++ /dev/null @@ -1,3 +0,0 @@ -/* Linux defines the ftime system call but doesn't actually implement - it. Use the BSD implementation. */ -#include diff --git a/time/ftime.c b/time/ftime.c index 6c2a256048..de8d043893 100644 --- a/time/ftime.c +++ b/time/ftime.c @@ -15,27 +15,25 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include +#include int ftime (struct timeb *timebuf) { - int save = errno; - struct tm tp; + struct timespec ts; - __set_errno (0); - if (time (&timebuf->time) == (time_t) -1 && errno != 0) + if (__clock_gettime (CLOCK_REALTIME, &ts) < 0) return -1; - timebuf->millitm = 0; - - if (__localtime_r (&timebuf->time, &tp) == NULL) - return -1; - - timebuf->timezone = tp.tm_gmtoff / 60; - timebuf->dstflag = tp.tm_isdst; - __set_errno (save); + timebuf->time = ts.tv_sec; + timebuf->millitm = (ts.tv_nsec + 500000) / 1000000; + if (timebuf->millitm == 1000) + { + ++timebuf->time; + timebuf->millitm = 0; + } + timebuf->timezone = 0; + timebuf->dstflag = 0; return 0; }