From: Samuel Thibault <samuel.thibault@gnu.org>
To: Sergey Bugaev <bugaevc@gmail.com>
Cc: bug-hurd@gnu.org, libc-alpha@sourceware.org,
"Flávio Cruz" <flaviocruz@gmail.com>
Subject: Re: [RFC PATCH glibc 5/12] htl: Fix semaphore reference
Date: Sun, 12 Feb 2023 15:57:39 +0100 [thread overview]
Message-ID: <20230212145739.ccy5u5ljo46iuzit@begin> (raw)
In-Reply-To: <20230212111044.610942-6-bugaevc@gmail.com>
Applied, thanks!
Sergey Bugaev, le dim. 12 févr. 2023 14:10:36 +0300, a ecrit:
> 'sem' is the opaque 'sem_t', 'isem' is the actual 'struct new_sem'.
>
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
> sysdeps/htl/sem-timedwait.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sysdeps/htl/sem-timedwait.c b/sysdeps/htl/sem-timedwait.c
> index 8f2df6e7..9974e9ae 100644
> --- a/sysdeps/htl/sem-timedwait.c
> +++ b/sysdeps/htl/sem-timedwait.c
> @@ -60,7 +60,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
> int cancel_oldtype = LIBC_CANCEL_ASYNC();
>
> #if __HAVE_64B_ATOMICS
> - uint64_t d = atomic_fetch_add_relaxed (&sem->data,
> + uint64_t d = atomic_fetch_add_relaxed (&isem->data,
> (uint64_t) 1 << SEM_NWAITERS_SHIFT);
>
> pthread_cleanup_push (__sem_wait_cleanup, isem);
> @@ -72,11 +72,11 @@ __sem_timedwait_internal (sem_t *restrict sem,
> /* No token, sleep. */
> if (timeout)
> err = __lll_abstimed_wait_intr (
> - ((unsigned int *) &sem->data) + SEM_VALUE_OFFSET,
> + ((unsigned int *) &isem->data) + SEM_VALUE_OFFSET,
> 0, timeout, flags, clock_id);
> else
> err = __lll_wait_intr (
> - ((unsigned int *) &sem->data) + SEM_VALUE_OFFSET,
> + ((unsigned int *) &isem->data) + SEM_VALUE_OFFSET,
> 0, flags);
>
> if (err != 0 && err != KERN_INVALID_ARGUMENT)
> @@ -92,12 +92,12 @@ __sem_timedwait_internal (sem_t *restrict sem,
> }
>
> /* Token changed */
> - d = atomic_load_relaxed (&sem->data);
> + d = atomic_load_relaxed (&isem->data);
> }
> else
> {
> /* Try to acquire and dequeue. */
> - if (atomic_compare_exchange_weak_acquire (&sem->data,
> + if (atomic_compare_exchange_weak_acquire (&isem->data,
> &d, d - 1 - ((uint64_t) 1 << SEM_NWAITERS_SHIFT)))
> {
> /* Success */
> --
> 2.39.1
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
next prev parent reply other threads:[~2023-02-12 14:57 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-12 11:10 [RFC PATCH 0/12] Towards glibc on x86_64-gnu Sergey Bugaev
2023-02-12 11:10 ` [RFC PATCH glibc 1/12] hurd: Refactor readlinkat() Sergey Bugaev
2023-02-12 14:49 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH glibc 2/12] hurd: Use mach_msg_type_number_t where appropriate Sergey Bugaev
2023-02-12 14:52 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH glibc 3/12] mach, hurd: Cast through uintptr_t Sergey Bugaev
2023-02-12 14:55 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH glibc 4/12] hurd: Fix xattr error value Sergey Bugaev
2023-02-12 14:56 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH glibc 5/12] htl: Fix semaphore reference Sergey Bugaev
2023-02-12 14:57 ` Samuel Thibault [this message]
2023-02-12 11:10 ` [RFC PATCH hurd 6/12] hurd: Fix modes_t and speeds_t types on 64-bit Sergey Bugaev
2023-02-12 15:00 ` Samuel Thibault
2023-02-12 15:15 ` Sergey Bugaev
2023-02-12 15:22 ` Samuel Thibault
2023-02-12 16:13 ` Sergey Bugaev
2023-02-12 16:30 ` Samuel Thibault
2023-02-12 19:03 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH mig 7/12] Drop -undef -ansi from cpp flags Sergey Bugaev
2023-02-12 15:01 ` Samuel Thibault
2023-02-12 18:43 ` Flávio Cruz
2023-02-12 18:44 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH mig 8/12] Set max type alignment to sizeof(long) Sergey Bugaev
2023-02-12 11:10 ` [RFC PATCH glibc 9/12] mach: Look for mach_i386.defs on x86_64 too Sergey Bugaev
2023-02-12 15:07 ` Samuel Thibault
2023-02-12 15:38 ` Sergey Bugaev
2023-02-12 15:46 ` Samuel Thibault
2023-02-12 16:01 ` Sergey Bugaev
2023-02-16 20:22 ` Joseph Myers
2023-02-12 11:10 ` [RFC PATCH glibc 10/12] hurd: Set up the basic tree for x86_64-gnu Sergey Bugaev
2023-02-12 15:15 ` Samuel Thibault
2023-02-12 11:10 ` [RFC PATCH glibc 11/12] hurd, htl: Add some x86_64-specific code Sergey Bugaev
2023-02-12 16:11 ` Samuel Thibault
2023-02-12 16:25 ` Sergey Bugaev
2023-02-12 16:36 ` Samuel Thibault
2023-02-12 16:40 ` Florian Weimer
2023-02-12 16:46 ` Samuel Thibault
2023-02-12 19:29 ` Florian Weimer
2023-02-12 19:37 ` Samuel Thibault
2023-02-12 16:51 ` Sergey Bugaev
2023-02-12 17:02 ` Samuel Thibault
2023-02-12 17:06 ` Sergey Bugaev
2023-02-12 11:10 ` [RFC PATCH glibc 12/12] C11 thrd: Downgrade the default alignment of mtx_t Sergey Bugaev
2023-02-12 15:18 ` Samuel Thibault
2023-02-12 15:52 ` Sergey Bugaev
2023-02-12 16:29 ` Samuel Thibault
2023-02-12 16:12 ` [RFC PATCH 0/12] Towards glibc on x86_64-gnu Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230212145739.ccy5u5ljo46iuzit@begin \
--to=samuel.thibault@gnu.org \
--cc=bug-hurd@gnu.org \
--cc=bugaevc@gmail.com \
--cc=flaviocruz@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).