From patchwork Tue Dec 9 15:24:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 419147 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E13B14009B for ; Wed, 10 Dec 2014 02:24:26 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=OXcq0EnIhOSvNqyI1tKgNXC03tcoF pdK3PH+xM+2IG0IzDF58bpSEtvOQ6ymsUBwP4jImnq1KXC5T+H9AqI2eaX3nQ3sk PU1X8Rl/VoeiQcIM5XAPPNdu0nq8ySZpacIWSI/wBGVZa+MS4CgS31U3sUgiiRbV XPpUz7KF+/bdmc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type; s=default; bh=yQyENK8Kn9DFryeoHdcAcL9nAJw=; b=nq3 5+Gm9Xs4LdyJoeRTkCyTSllH748LdullW3zWfFnhIH0R6EzsS3pNhxJDdaMPUuqc tY3/x29oDsfYplNg/qYid7E5oK3ebBs/ERvf8vRgsvc8vIqsu6HuH1mgHIze6AbB bMwrjx4kz+FDIk9IHMEuUzhYCNhT/Irydv7knDNE= Received: (qmail 6063 invoked by alias); 9 Dec 2014 15:24:19 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 6046 invoked by uid 89); 9 Dec 2014 15:24:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Properly handle forced elision in pthread_mutex_trylock X-Yow: WHO sees a BEACH BUNNY sobbing on a SHAG RUG?! Date: Tue, 09 Dec 2014 16:24:13 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 According to https://sourceware.org/bugzilla/show_bug.cgi?id=16657#c10 this is the correct solution. Andreas. [BZ #16657] * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Use FORCE_ELISION instead of DO_ELISION. * sysdeps/unix/sysv/linux/x86/force-elision.h (DO_ELISION): Remove. * sysdeps/unix/sysv/linux/s390/force-elision.h (DO_ELISION): Likewise. --- nptl/pthread_mutex_trylock.c | 10 +++------- sysdeps/unix/sysv/linux/s390/force-elision.h | 5 ----- sysdeps/unix/sysv/linux/x86/force-elision.h | 5 ----- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c index 0293d0f..c4622aa 100644 --- a/nptl/pthread_mutex_trylock.c +++ b/nptl/pthread_mutex_trylock.c @@ -26,13 +26,10 @@ #define lll_trylock_elision(a,t) lll_trylock(a) #endif -#ifndef DO_ELISION -#define DO_ELISION(m) 0 +#ifndef FORCE_ELISION +#define FORCE_ELISION(m, s) #endif -/* We don't force elision in trylock, because this can lead to inconsistent - lock state if the lock was actually busy. */ - int __pthread_mutex_trylock (mutex) pthread_mutex_t *mutex; @@ -77,8 +74,7 @@ __pthread_mutex_trylock (mutex) return 0; case PTHREAD_MUTEX_TIMED_NP: - if (DO_ELISION (mutex)) - goto elision; + FORCE_ELISION (mutex, goto elision); /*FALL THROUGH*/ case PTHREAD_MUTEX_ADAPTIVE_NP: case PTHREAD_MUTEX_ERRORCHECK_NP: diff --git a/sysdeps/unix/sysv/linux/s390/force-elision.h b/sysdeps/unix/sysv/linux/s390/force-elision.h index 8fd7684..31b3662 100644 --- a/sysdeps/unix/sysv/linux/s390/force-elision.h +++ b/sysdeps/unix/sysv/linux/s390/force-elision.h @@ -17,11 +17,6 @@ . */ #ifdef ENABLE_LOCK_ELISION -/* Check for elision on this lock without upgrading. */ -#define DO_ELISION(m) \ - (__pthread_force_elision \ - && (m->__data.__kind & PTHREAD_MUTEX_NO_ELISION_NP) == 0) \ - /* Automatically enable elision for existing user lock kinds. */ #define FORCE_ELISION(m, s) \ if (__pthread_force_elision \ diff --git a/sysdeps/unix/sysv/linux/x86/force-elision.h b/sysdeps/unix/sysv/linux/x86/force-elision.h index 945f886..a767cf1 100644 --- a/sysdeps/unix/sysv/linux/x86/force-elision.h +++ b/sysdeps/unix/sysv/linux/x86/force-elision.h @@ -16,11 +16,6 @@ License along with the GNU C Library; if not, see . */ -/* Check for elision on this lock without upgrading. */ -#define DO_ELISION(m) \ - (__pthread_force_elision \ - && (m->__data.__kind & PTHREAD_MUTEX_NO_ELISION_NP) == 0) \ - /* Automatically enable elision for existing user lock kinds. */ #define FORCE_ELISION(m, s) \ if (__pthread_force_elision \