From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 5412538582BD; Wed, 30 Aug 2023 12:39:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5412538582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693399189; bh=sFDlWs1sKRJAw+kQtb8i6sS61k7kj6BjfukcqT77Bi0=; h=From:To:Subject:Date:From; b=CNjxq73/kAPFZFwI6y+b7PXuDaAfo0fRiD/yGe/bok/BF+bgjCtuKV4V1RiYSpX5V c1FvP3/un5Zi6AdPjjW8wkcYRNufs+2PXTAK/ZUlbOyNk7ErKKAhLOLTWs5cVUD1tJ fsJpOdBhWv4hqjJ2GkCRY2HNwYQed5fuv9KagrE4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] linux: Adequate tst-clone3 to c11 atomics X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 1b86cf0617838cb0d64a50e65d04732d5f91215a X-Git-Newrev: 300c67ab5cbe5d71177698f87e28c6db78d69e58 Message-Id: <20230830123949.5412538582BD@sourceware.org> Date: Wed, 30 Aug 2023 12:39:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=300c67ab5cbe5d71177698f87e28c6db78d69e58 commit 300c67ab5cbe5d71177698f87e28c6db78d69e58 Author: Adhemerval Zanella Date: Fri Mar 25 11:27:46 2022 -0300 linux: Adequate tst-clone3 to c11 atomics Diff: --- sysdeps/unix/sysv/linux/tst-clone3-internal.c | 8 +++----- sysdeps/unix/sysv/linux/tst-clone3.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-clone3-internal.c b/sysdeps/unix/sysv/linux/tst-clone3-internal.c index a88ce52cec..614488e7f8 100644 --- a/sysdeps/unix/sysv/linux/tst-clone3-internal.c +++ b/sysdeps/unix/sysv/linux/tst-clone3-internal.c @@ -45,16 +45,14 @@ f (void *a) implementation. */ #define wait_tid(ctid_ptr, ctid_val) \ do { \ - __typeof (*(ctid_ptr)) __tid; \ /* We need acquire MO here so that we synchronize with the \ kernel's store to 0 when the clone terminates. */ \ - while ((__tid = atomic_load_explicit (ctid_ptr, \ - memory_order_acquire)) != 0) \ + while (atomic_load_explicit (ctid_ptr, memory_order_acquire) != 0) \ futex_wait (ctid_ptr, ctid_val); \ } while (0) static inline int -futex_wait (int *futexp, int val) +futex_wait (_Atomic pid_t *futexp, int val) { #ifdef __NR_futex return syscall (__NR_futex, futexp, FUTEX_WAIT, val); @@ -75,7 +73,7 @@ do_test (void) /* Initialize with a known value. ctid is set to zero by the kernel after the cloned thread has exited. */ #define CTID_INIT_VAL 1 - pid_t ctid = CTID_INIT_VAL; + _Atomic pid_t ctid = CTID_INIT_VAL; pid_t tid; struct clone_args clone_args = diff --git a/sysdeps/unix/sysv/linux/tst-clone3.c b/sysdeps/unix/sysv/linux/tst-clone3.c index 87638e9578..c2b206fccb 100644 --- a/sysdeps/unix/sysv/linux/tst-clone3.c +++ b/sysdeps/unix/sysv/linux/tst-clone3.c @@ -45,16 +45,14 @@ f (void *a) implementation. */ #define wait_tid(ctid_ptr, ctid_val) \ do { \ - __typeof (*(ctid_ptr)) __tid; \ /* We need acquire MO here so that we synchronize with the \ kernel's store to 0 when the clone terminates. */ \ - while ((__tid = atomic_load_explicit (ctid_ptr, \ - memory_order_acquire)) != 0) \ + while (atomic_load_explicit (ctid_ptr, memory_order_acquire) != 0) \ futex_wait (ctid_ptr, ctid_val); \ } while (0) static inline int -futex_wait (int *futexp, int val) +futex_wait (_Atomic pid_t *futexp, int val) { #ifdef __NR_futex return syscall (__NR_futex, futexp, FUTEX_WAIT, val); @@ -75,7 +73,7 @@ do_test (void) /* Initialize with a known value. ctid is set to zero by the kernel after the cloned thread has exited. */ #define CTID_INIT_VAL 1 - pid_t ctid = CTID_INIT_VAL; + _Atomic pid_t ctid = CTID_INIT_VAL; pid_t tid; #ifdef __ia64__