From patchwork Wed Apr 18 20:17:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26815 Received: (qmail 117602 invoked by alias); 18 Apr 2018 20:21:16 -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 117510 invoked by uid 89); 18 Apr 2018 20:21:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 36/63] Y2038: add function __gettimeofday64 Date: Wed, 18 Apr 2018 22:17:52 +0200 Message-Id: <20180418201819.15952-37-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-36-albert.aribaud@3adev.fr> References: <20180418201819.15952-1-albert.aribaud@3adev.fr> <20180418201819.15952-2-albert.aribaud@3adev.fr> <20180418201819.15952-3-albert.aribaud@3adev.fr> <20180418201819.15952-4-albert.aribaud@3adev.fr> <20180418201819.15952-5-albert.aribaud@3adev.fr> <20180418201819.15952-6-albert.aribaud@3adev.fr> <20180418201819.15952-7-albert.aribaud@3adev.fr> <20180418201819.15952-8-albert.aribaud@3adev.fr> <20180418201819.15952-9-albert.aribaud@3adev.fr> <20180418201819.15952-10-albert.aribaud@3adev.fr> <20180418201819.15952-11-albert.aribaud@3adev.fr> <20180418201819.15952-12-albert.aribaud@3adev.fr> <20180418201819.15952-13-albert.aribaud@3adev.fr> <20180418201819.15952-14-albert.aribaud@3adev.fr> <20180418201819.15952-15-albert.aribaud@3adev.fr> <20180418201819.15952-16-albert.aribaud@3adev.fr> <20180418201819.15952-17-albert.aribaud@3adev.fr> <20180418201819.15952-18-albert.aribaud@3adev.fr> <20180418201819.15952-19-albert.aribaud@3adev.fr> <20180418201819.15952-20-albert.aribaud@3adev.fr> <20180418201819.15952-21-albert.aribaud@3adev.fr> <20180418201819.15952-22-albert.aribaud@3adev.fr> <20180418201819.15952-23-albert.aribaud@3adev.fr> <20180418201819.15952-24-albert.aribaud@3adev.fr> <20180418201819.15952-25-albert.aribaud@3adev.fr> <20180418201819.15952-26-albert.aribaud@3adev.fr> <20180418201819.15952-27-albert.aribaud@3adev.fr> <20180418201819.15952-28-albert.aribaud@3adev.fr> <20180418201819.15952-29-albert.aribaud@3adev.fr> <20180418201819.15952-30-albert.aribaud@3adev.fr> <20180418201819.15952-31-albert.aribaud@3adev.fr> <20180418201819.15952-32-albert.aribaud@3adev.fr> <20180418201819.15952-33-albert.aribaud@3adev.fr> <20180418201819.15952-34-albert.aribaud@3adev.fr> <20180418201819.15952-35-albert.aribaud@3adev.fr> <20180418201819.15952-36-albert.aribaud@3adev.fr> Implementing a 64-bit settimeofday requires adding a new file to build under time/ and we cannot name that new file 'settimeofday.c' or it will break the 32-bit settimeofday symbol, so we call it 'settimeofday64.c'. --- include/sys/time.h | 2 ++ sysdeps/unix/sysv/linux/gettimeofday64.c | 48 ++++++++++++++++++++++++++++++++ time/Makefile | 1 + time/Versions | 1 + time/gettimeofday.c | 11 +++++++- 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/gettimeofday64.c diff --git a/include/sys/time.h b/include/sys/time.h index 98f6b6b2cc..ed73a445bf 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -24,6 +24,8 @@ extern int __gettimeofday (struct timeval *__tv, struct timezone *__tz); libc_hidden_proto (__gettimeofday) libc_hidden_proto (gettimeofday) +extern int __gettimeofday64 (struct __timeval64 *__tv, + struct timezone *__tz); extern int __settimeofday (const struct timeval *__tv, const struct timezone *__tz) attribute_hidden; diff --git a/sysdeps/unix/sysv/linux/gettimeofday64.c b/sysdeps/unix/sysv/linux/gettimeofday64.c new file mode 100644 index 0000000000..bde2a7e973 --- /dev/null +++ b/sysdeps/unix/sysv/linux/gettimeofday64.c @@ -0,0 +1,48 @@ +/* Copyright (C) 2015-2018 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 + +#undef __gettimeofday + +#ifdef HAVE_GETTIMEOFDAY_VSYSCALL +# define HAVE_VSYSCALL +#endif +#include + +/* Get the current time of day and timezone information, + putting it into *tv and *tz. If tz is null, *tz is not filled. + Returns 0 on success, -1 on errors. */ + +int +__gettimeofday64 (struct __timeval64 *tv, struct timezone *tz) +{ + struct timeval tv32; + int result; + + result = INLINE_VSYSCALL (gettimeofday, 2, &tv32, tz); + + if (result == 0) + { + tv->tv_sec = tv32.tv_sec; + tv->tv_usec = tv32.tv_usec; + } + + return result; +} diff --git a/time/Makefile b/time/Makefile index 0db1206820..f71847f2b3 100644 --- a/time/Makefile +++ b/time/Makefile @@ -32,6 +32,7 @@ headers := time.h sys/time.h sys/timeb.h bits/time.h \ routines := offtime asctime clock ctime ctime_r difftime \ gmtime localtime mktime time \ gettimeofday settimeofday adjtime tzset \ + gettimeofday64 \ tzfile getitimer setitimer \ stime dysize timegm ftime \ getdate strptime strptime_l \ diff --git a/time/Versions b/time/Versions index ac92d742c3..dff4717af9 100644 --- a/time/Versions +++ b/time/Versions @@ -84,5 +84,6 @@ libc { __sigtimedwait64; __futimes64; __lutimes64; + __gettimeofday64; } } diff --git a/time/gettimeofday.c b/time/gettimeofday.c index d1ab9acd17..e4a67c6d99 100644 --- a/time/gettimeofday.c +++ b/time/gettimeofday.c @@ -16,7 +16,6 @@ . */ #include -#include /* Get the current time of day and timezone information, putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled. @@ -32,3 +31,13 @@ weak_alias (__gettimeofday, gettimeofday) libc_hidden_weak (gettimeofday) stub_warning (gettimeofday) + +/* 64-bit time version */ + +int +__gettimeofday64 (struct timeval *tv, struct timezone *tz) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__gettimeofday64)