From patchwork Sun Mar 9 22:11:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 107567 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C8883858D20 for ; Sun, 9 Mar 2025 22:12:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C8883858D20 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 96D0F3858D1E for ; Sun, 9 Mar 2025 22:11:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 96D0F3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 96D0F3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741558317; cv=none; b=QnEN9ZywwnYbYAS2PTldB15axTaeTbi6kc6Xh4sgQdB1Ja0ujdha00FlHYV+22PnJeCNWYN6zcCungDxpmmasFM8we0pRXKWKj2C1eul+djFZAd9K0euyJk6/Y1MJa2phOIEKR/cinGZ5l7WNIvMbVgCySBYJXeUfDhWEKNjyeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741558317; c=relaxed/simple; bh=J3AQR/YB03YGgVRp6bLFD3RNeX4g3uq1ISTFU2vGN1A=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=trYp66OEShoi0qkg4uhxIx5AZ3Zw7F8MA4uGtD8oW8vjw26JtQlD+kjfVcQ6vpNboo1oewwqicnfDyM7Yi4lsqB8dIH+MER0Eh+MKAlMd8OP+yYvYeg02XTNtAYAvDcf+OUb2kxZXrsz5ws1GRRcHp/w7rzlr3ukHug68pFURgQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 96D0F3858D1E Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 6E993A1F66; Sun, 9 Mar 2025 23:11:56 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ara3W7iTaSYz; Sun, 9 Mar 2025 23:11:56 +0100 (CET) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 384A4A1DB1; Sun, 9 Mar 2025 23:11:56 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1trOsF-00000003vtV-2ZPF; Sun, 09 Mar 2025 23:11:55 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [PATCH] aio_suspend64: Fix clock discrepancy Date: Sun, 9 Mar 2025 23:11:55 +0100 Message-ID: <20250309221155.937522-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org cc5d5852c65e ("y2038: Convert aio_suspend to support 64 bit time") switched from __clock_gettime (CLOCK_REALTIME, &now); to __clock_gettime64 (CLOCK_MONOTONIC, &ts);, but pthread_cond_timedwait is based on the absolute realtime clock, not the monotonic clock. --- rt/aio_suspend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c index 2257cd80d4..49a86f6ab3 100644 --- a/rt/aio_suspend.c +++ b/rt/aio_suspend.c @@ -161,7 +161,7 @@ ___aio_suspend_time64 (const struct aiocb *const list[], int nent, struct __timespec64 ts; if (timeout != NULL) { - __clock_gettime64 (CLOCK_MONOTONIC, &ts); + __clock_gettime64 (CLOCK_REALTIME, &ts); ts.tv_sec += timeout->tv_sec; ts.tv_nsec += timeout->tv_nsec; if (ts.tv_nsec >= 1000000000)