From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 094823858C39; Tue, 4 Oct 2022 13:02:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 094823858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664888564; bh=xWGDCLQMdXg8Zg34O/zWyF4Q97g9q8/gE01sRrWx2sE=; h=From:To:Subject:Date:From; b=f9C94U6pkxsBF4oT/cxLSwahb72ZV8EctwxB+LLXtAKatpM1hyEg+ASnVe9ObHzNj dFQHhQzVoHNWJYgafIkquD/X5ql+9ren/hUxTVFY3RSFbjQRqbbCYqkBKxgusvRxkz aeE4SRsyQxRXN5a2PS8BS0+CUNn1vvBA0dXPxNag= 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: 252696c271824fc702655dbb4ee39e1d80909065 X-Git-Newrev: bab04df665684b3d4c59793b5d68acf4fdccdded Message-Id: <20221004130244.094823858C39@sourceware.org> Date: Tue, 4 Oct 2022 13:02:44 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bab04df665684b3d4c59793b5d68acf4fdccdded commit bab04df665684b3d4c59793b5d68acf4fdccdded 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 a5002a8fcc..d010011033 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 6390fe26e8..392fd19795 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__