From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) by sourceware.org (Postfix) with ESMTPS id ADEFC385DC33 for ; Tue, 24 Nov 2020 21:39:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org ADEFC385DC33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4Cgcq16Z66z1rwbX; Tue, 24 Nov 2020 22:39:09 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Cgcq165qTz1tF6G; Tue, 24 Nov 2020 22:39:09 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id fJYpNrBUqkpm; Tue, 24 Nov 2020 22:39:08 +0100 (CET) X-Auth-Info: s5WJDZczDgIwsiCFj5MUm2BmHPEMG9VlU/Ov/Tbeg18= Received: from jawa (89-64-5-98.dynamic.chello.pl [89.64.5.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 24 Nov 2020 22:39:08 +0100 (CET) Date: Tue, 24 Nov 2020 22:38:26 +0100 From: Lukasz Majewski To: Adhemerval Zanella via Libc-alpha Cc: Adhemerval Zanella , Michael Kerrisk Subject: Re: [PATCH 11/13] nptl: Replace lll_futex_wake with futex-internal.h Message-ID: <20201124223826.110ca4c3@jawa> In-Reply-To: <20201123195256.3336217-11-adhemerval.zanella@linaro.org> References: <20201123195256.3336217-1-adhemerval.zanella@linaro.org> <20201123195256.3336217-11-adhemerval.zanella@linaro.org> Organization: denx.de X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/z7oO_7phOaMqbh7B=Fo+GbN"; protocol="application/pgp-signature" X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Tue, 24 Nov 2020 21:39:12 -0000 --Sig_/z7oO_7phOaMqbh7B=Fo+GbN Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Adhemerval, > The idea is to make NPTL implementation to use on the functions > provided by futex-internal.h. >=20 > Checked on x86_64-linux-gnu and i686-linux-gnu. > --- > nptl/pthread_mutex_setprioceiling.c | 4 ++-- > nptl/pthread_mutex_unlock.c | 6 +++--- > nptl/sem_post.c | 9 ++------- > 3 files changed, 7 insertions(+), 12 deletions(-) >=20 > diff --git a/nptl/pthread_mutex_setprioceiling.c > b/nptl/pthread_mutex_setprioceiling.c index cbef202579..8f1d6e1326 > 100644 --- a/nptl/pthread_mutex_setprioceiling.c > +++ b/nptl/pthread_mutex_setprioceiling.c > @@ -116,8 +116,8 @@ pthread_mutex_setprioceiling (pthread_mutex_t > *mutex, int prioceiling, | (prioceiling << > PTHREAD_MUTEX_PRIO_CEILING_SHIFT); atomic_full_barrier (); > =20 > - lll_futex_wake (&mutex->__data.__lock, INT_MAX, > - PTHREAD_MUTEX_PSHARED (mutex)); > + futex_wake ((unsigned int *)&mutex->__data.__lock, INT_MAX, > + PTHREAD_MUTEX_PSHARED (mutex)); > =20 > return 0; > } > diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c > index 2b4abb8ebe..56f1732e6d 100644 > --- a/nptl/pthread_mutex_unlock.c > +++ b/nptl/pthread_mutex_unlock.c > @@ -162,7 +162,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t > *mutex, int decr) private =3D PTHREAD_ROBUST_MUTEX_PSHARED (mutex); > if (__glibc_unlikely ((atomic_exchange_rel > (&mutex->__data.__lock, 0) & FUTEX_WAITERS) !=3D 0)) > - lll_futex_wake (&mutex->__data.__lock, 1, private); > + futex_wake ((unsigned int *) &mutex->__data.__lock, 1, > private);=20 > /* We must clear op_pending after we release the mutex. > FIXME However, this violates the mutex destruction > requirements @@ -332,8 +332,8 @@ __pthread_mutex_unlock_full > (pthread_mutex_t *mutex, int decr) &oldval, newval)); > =20 > if ((oldval & ~PTHREAD_MUTEX_PRIO_CEILING_MASK) > 1) > - lll_futex_wake (&mutex->__data.__lock, 1, > - PTHREAD_MUTEX_PSHARED (mutex)); > + futex_wake ((unsigned int *)&mutex->__data.__lock, 1, > + PTHREAD_MUTEX_PSHARED (mutex)); > =20 > int oldprio =3D newval >> PTHREAD_MUTEX_PRIO_CEILING_SHIFT; > =20 > diff --git a/nptl/sem_post.c b/nptl/sem_post.c > index 88cfc24b30..5dbfb3a214 100644 > --- a/nptl/sem_post.c > +++ b/nptl/sem_post.c > @@ -84,19 +84,14 @@ int > attribute_compat_text_section > __old_sem_post (sem_t *sem) > { > - int *futex =3D (int *) sem; > + unsigned int *futex =3D (unsigned int *) sem; > =20 > /* We must need to synchronize with consumers of this token, so > the atomic increment must have release MO semantics. */ > atomic_write_barrier (); > (void) atomic_increment_val (futex); > /* We always have to assume it is a shared semaphore. */ > - int err =3D lll_futex_wake (futex, 1, LLL_SHARED); > - if (__builtin_expect (err, 0) < 0) > - { > - __set_errno (-err); > - return -1; > - } > + futex_wake (futex, 1, LLL_SHARED); > return 0; > } > compat_symbol (libpthread, __old_sem_post, sem_post, GLIBC_2_0); Another little step to remove lll_* macros. Reviewed-by: Lukasz Majewski Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de --Sig_/z7oO_7phOaMqbh7B=Fo+GbN Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAl+9fVIACgkQAR8vZIA0 zr0u7Qf9HR0raRnKUDpHctQiok/oJT9H9AuAEnnK+pNWHO37ql2nfE6CRp6ZIepa Tgih4xBe0yhjBztYE+9Ltl2BYcJJ4Vwv5QOMlZvd0EYR3HqCTkvtlDCfDfxrVJ1z Hw4RClKuch5LUnbIlED+g0FStf4qjIbkjoYDXoVlaKx1gecu6nmOd/5/KOsDgwXq 69GHuXJox9llBWEroBSE1O1BTWvoJE0TV/oi+8yNxEMTVlN6zqU2DfN82KC6xL4g WblVxGJM81WOPE/ZJ1AS8YPH+iJvvWwBBnwFIAn0omgDHVKHsLcj5wLZ1ZNh6Od5 n/kcF9Re0M2LYvy6q7T1I+HM1RomxQ== =0tRS -----END PGP SIGNATURE----- --Sig_/z7oO_7phOaMqbh7B=Fo+GbN--