This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[pushed] hurd: Use __clock_gettime in _hurd_select
- From: "Sourceware to Gerrit sync (Code Review)" <gerrit at gnutoolchain-gerrit dot osci dot io>
- To: Florian Weimer <fweimer at redhat dot com>, libc-alpha at sourceware dot org
- Cc: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- Date: Thu, 7 Nov 2019 04:00:12 -0500
- Subject: [pushed] hurd: Use __clock_gettime in _hurd_select
- Auto-submitted: auto-generated
- References: <gerrit.1572857958000.Ia6da4045157a5bbccc67d79e881d7592e6f8a890@gnutoolchain-gerrit.osci.io>
- Reply-to: noreply at gnutoolchain-gerrit dot osci dot io, adhemerval dot zanella at linaro dot org, fweimer at redhat dot com, libc-alpha at sourceware dot org
Sourceware to Gerrit sync has submitted this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/506
......................................................................
hurd: Use __clock_gettime in _hurd_select
The __gettimeofday references caused check-localplt failures after
commit 5e46749c64d5.
Fixes: 5e46749c64d51f50f8511ed99c1266d7c13e182b
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Change-Id: Ia6da4045157a5bbccc67d79e881d7592e6f8a890
---
M hurd/hurdselect.c
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index 79cd20b..6a174bc 100644
--- a/hurd/hurdselect.c
+++ b/hurd/hurdselect.c
@@ -88,7 +88,7 @@
reply_msgid = IO_SELECT_REPLY_MSGID;
else
{
- struct timeval now;
+ struct timespec now;
if (timeout->tv_sec < 0 || ! valid_nanoseconds (timeout->tv_nsec))
{
@@ -96,12 +96,12 @@
return -1;
}
- err = __gettimeofday(&now, NULL);
+ err = __clock_gettime (CLOCK_REALTIME, &now);
if (err)
return -1;
ts.tv_sec = now.tv_sec + timeout->tv_sec;
- ts.tv_nsec = now.tv_usec * 1000 + timeout->tv_nsec;
+ ts.tv_nsec = now.tv_nsec + timeout->tv_nsec;
if (ts.tv_nsec >= 1000000000)
{
@@ -175,8 +175,7 @@
if (error)
{
/* Set timeout to 0. */
- struct timeval now;
- err = __gettimeofday(&now, NULL);
+ err = __clock_gettime (CLOCK_REALTIME, &ts);
if (err)
{
/* Really bad luck. */
@@ -192,8 +191,6 @@
errno = err;
return -1;
}
- ts.tv_sec = now.tv_sec;
- ts.tv_nsec = now.tv_usec * 1000;
reply_msgid = IO_SELECT_TIMEOUT_REPLY_MSGID;
}
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: Ia6da4045157a5bbccc67d79e881d7592e6f8a890
Gerrit-Change-Number: 506
Gerrit-PatchSet: 2
Gerrit-Owner: Florian Weimer <fweimer@redhat.com>
Gerrit-Reviewer: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-MessageType: merged