From patchwork Sat May 20 11:55:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 69718 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 68B0C3857700 for ; Sat, 20 May 2023 11:56:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 68B0C3857700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684583761; bh=wkdLbGg2Ogg5ZRQgtOFfnYbrAp4mNkYdTZcEDO9ofj8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=DZVoU/t7RwxQrv7z0QwTm6xXB2hCNhpmwVrdQlMYPcQ1Q7L47RTU9kZOR5mEefXQa EnFCvNIOifPPK9htTn35kbKrxwZITK2RhesC6Z+r0LoD/STSAKF5aJQbuELljgDM4D GIJ2D7t7KAJp8abaNka81LQ+f90A+HVi/51Osi2g= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by sourceware.org (Postfix) with ESMTPS id 119C53858C5F for ; Sat, 20 May 2023 11:55:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 119C53858C5F Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2af177f12a5so32652961fa.2 for ; Sat, 20 May 2023 04:55:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684583735; x=1687175735; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wkdLbGg2Ogg5ZRQgtOFfnYbrAp4mNkYdTZcEDO9ofj8=; b=ibx877FmM+i8ZKRiXsnkzbSQfknmaH2xh50+Ju5A8ljqSMiYsPYWE7uhy34zkOhy1u xww3rdahXOG/t2BsFq7RzvqtSefvLTM+HRhAWqGcBEEazOT/GzBo2iIfI4BR4WKRxFfK ouCtskORv7T385QsrNjxTCq3wgxpFzxKp9C/riz17SCTyZIBSex010VsUYCkNmrc0vQX MK9ToEIbnILFSUm9dXQxnXWKP/HYTzEg+/0KrqUZlCymbeKPQlzfOcfaZhWlRrgNM6Ty +XLBLbjnYnp3/2d4ht9q7UdveFTFll92/lTQUyDoU74IhcDz8A9AMMHhl1u+dQ0L/9jn tiAQ== X-Gm-Message-State: AC+VfDxkhArYPqqgW2HQ86UKBYUm9usmX4A9znvzPyI8q/eZGVFAJSL+ MqNVCq+gh3Z8yi32V6V61dmOwh20u4Y= X-Google-Smtp-Source: ACHHUZ7/LfvUmPxNJq0hNMJccB9rMWbTO167gjSzugEkZ5sWj+zCoWTE1oT60cdVomZKLHauapbFtA== X-Received: by 2002:a05:6512:25a:b0:4eb:c85:bdc2 with SMTP id b26-20020a056512025a00b004eb0c85bdc2mr1849597lfo.2.1684583734730; Sat, 20 May 2023 04:55:34 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:c81f:63f8:270e:be79]) by smtp.gmail.com with ESMTPSA id k7-20020ac24567000000b004efe9a169d2sm250767lfm.64.2023.05.20.04.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 04:55:34 -0700 (PDT) To: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: [PATCH 2/3] htl: Use __hurd_fail () instead of assigning errno Date: Sat, 20 May 2023 14:55:30 +0300 Message-Id: <20230520115531.3911877-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520115531.3911877-1-bugaevc@gmail.com> References: <20230520115531.3911877-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sergey Bugaev via Libc-alpha From: Sergey Bugaev Reply-To: Sergey Bugaev Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Signed-off-by: Sergey Bugaev --- *Technically*, sysdeps/htl/ is not Hurd-specific (unlike, say, sysdeps/hurd/htl), but I don't think this distinction is meaningful, and the H in HTL must stand for something. Still, this is in a separate patch so it can be (not) applied easily. sysdeps/htl/sem-destroy.c | 6 ++---- sysdeps/htl/sem-init.c | 6 ++---- sysdeps/htl/sem-post.c | 11 +++-------- sysdeps/htl/sem-trywait.c | 4 ++-- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/sysdeps/htl/sem-destroy.c b/sysdeps/htl/sem-destroy.c index 3e40151b..84a35ed5 100644 --- a/sysdeps/htl/sem-destroy.c +++ b/sysdeps/htl/sem-destroy.c @@ -19,6 +19,7 @@ #include #include +#include #include int @@ -34,10 +35,7 @@ __sem_destroy (sem_t *sem) #endif ) /* There are threads waiting on *SEM. */ - { - errno = EBUSY; - return -1; - } + return __hurd_fail (EBUSY); return 0; } diff --git a/sysdeps/htl/sem-init.c b/sysdeps/htl/sem-init.c index f04bbfdc..f2954acd 100644 --- a/sysdeps/htl/sem-init.c +++ b/sysdeps/htl/sem-init.c @@ -19,6 +19,7 @@ #include #include +#include #include int @@ -26,10 +27,7 @@ __sem_init (sem_t *sem, int pshared, unsigned value) { #ifdef SEM_VALUE_MAX if (value > SEM_VALUE_MAX) - { - errno = EINVAL; - return -1; - } + return __hurd_fail (EINVAL); #endif struct new_sem *isem = (struct new_sem *) sem; diff --git a/sysdeps/htl/sem-post.c b/sysdeps/htl/sem-post.c index e283161a..c57458c1 100644 --- a/sysdeps/htl/sem-post.c +++ b/sysdeps/htl/sem-post.c @@ -20,6 +20,7 @@ #include #include +#include #include @@ -35,10 +36,7 @@ __sem_post (sem_t *sem) do { if ((d & SEM_VALUE_MASK) == SEM_VALUE_MAX) - { - errno = EOVERFLOW; - return -1; - } + return __hurd_fail (EOVERFLOW); } while (!atomic_compare_exchange_weak_release (&isem->data, &d, d + 1)); @@ -51,10 +49,7 @@ __sem_post (sem_t *sem) do { if ((v >> SEM_VALUE_SHIFT) == SEM_VALUE_MAX) - { - errno = EOVERFLOW; - return -1; - } + return __hurd_fail (EOVERFLOW); } while (!atomic_compare_exchange_weak_release (&isem->value, &v, v + (1 << SEM_VALUE_SHIFT))); diff --git a/sysdeps/htl/sem-trywait.c b/sysdeps/htl/sem-trywait.c index 0959092e..43aa185c 100644 --- a/sysdeps/htl/sem-trywait.c +++ b/sysdeps/htl/sem-trywait.c @@ -19,6 +19,7 @@ #include #include +#include #include int @@ -29,8 +30,7 @@ __sem_trywait (sem_t *sem) if (__sem_waitfast (isem, 1) == 0) return 0; - errno = EAGAIN; - return -1; + return __hurd_fail (EAGAIN); } weak_alias (__sem_trywait, sem_trywait);