From patchwork Mon Nov 4 08:59:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35606 Received: (qmail 113954 invoked by alias); 4 Nov 2019 08:59:26 -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 113886 invoked by uid 89); 4 Nov 2019 08:59:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=luck, HContent-Transfer-Encoding:8bit X-HELO: mx1.osci.io X-Gerrit-PatchSet: 1 Date: Mon, 4 Nov 2019 03:59:18 -0500 From: "Florian Weimer (Code Review)" To: libc-alpha@sourceware.org Cc: Florian Weimer Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] hurd: Use __clock_gettime in _hurd_select X-Gerrit-Change-Id: Ia6da4045157a5bbccc67d79e881d7592e6f8a890 X-Gerrit-Change-Number: 506 X-Gerrit-ChangeURL: X-Gerrit-Commit: 5ceba8a4a9809198066282ba136afaae52b585de References: Reply-To: fweimer@redhat.com, fweimer@redhat.com, libc-alpha@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-75-g9005159e5d 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 Change-Id: Ia6da4045157a5bbccc67d79e881d7592e6f8a890 Reviewed-by: Samuel Thibault --- 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; }