From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29836 invoked by alias); 24 May 2007 21:19:05 -0000 Received: (qmail 29813 invoked by uid 22791); 24 May 2007 21:19:02 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 24 May 2007 21:19:00 +0000 Received: from sunsite.mff.cuni.cz (localhost.localdomain [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.8/8.13.8) with ESMTP id l4OLKoHf007303; Thu, 24 May 2007 23:20:50 +0200 Received: (from jakub@localhost) by sunsite.mff.cuni.cz (8.13.8/8.13.8/Submit) id l4OLKo6V007302; Thu, 24 May 2007 23:20:50 +0200 Date: Thu, 24 May 2007 21:19:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Use THREAD_*_PRIVATE_FUTEX macros Message-ID: <20070524212049.GH3081@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2007-05/txt/msg00021.txt.bz2 Hi! This will be needed for ppc* as well, as private_futex will live outside of struct pthread there. In addition to this it allows all other arches to compile for the time being (well, when I port gscope_flag to them) and private futex support can be added there incrementally. 2007-04-24 Jakub Jelinek * sysdeps/i386/tls.h (THREAD_SET_PRIVATE_FUTEX, THREAD_COPY_PRIVATE_FUTEX): Define. * sysdeps/x86_64/tls.h (THREAD_SET_PRIVATE_FUTEX, THREAD_COPY_PRIVATE_FUTEX): Define. * allocatestack.c (allocate_stack): Use THREAD_COPY_PRIVATE_FUTEX. * init.c (__pthread_initialize_minimal_internal): Use THREAD_SET_PRIVATE_FUTEX. --- libc/nptl/sysdeps/i386/tls.h.jj 2007-05-24 17:53:37.000000000 +0200 +++ libc/nptl/sysdeps/i386/tls.h 2007-05-24 18:39:15.000000000 +0200 @@ -459,6 +459,15 @@ union user_desc_init GL(dl_wait_lookup_done) () +#ifndef __ASSUME_PRIVATE_FUTEX +# define THREAD_SET_PRIVATE_FUTEX(value) \ + THREAD_SETMEM (THREAD_SELF, header.private_futex, value) +# define THREAD_COPY_PRIVATE_FUTEX(descr) \ + ((descr)->header.private_futex \ + = THREAD_GETMEM (THREAD_SELF, header.private_futex)) +#endif + + #endif /* __ASSEMBLER__ */ #endif /* tls.h */ --- libc/nptl/sysdeps/x86_64/tls.h.jj 2007-05-24 17:53:58.000000000 +0200 +++ libc/nptl/sysdeps/x86_64/tls.h 2007-05-24 18:38:48.000000000 +0200 @@ -364,6 +364,13 @@ typedef struct #define THREAD_GSCOPE_WAIT() \ GL(dl_wait_lookup_done) () +#ifndef __ASSUME_PRIVATE_FUTEX +# define THREAD_SET_PRIVATE_FUTEX(value) \ + THREAD_SETMEM (THREAD_SELF, header.private_futex, value) +# define THREAD_COPY_PRIVATE_FUTEX(descr) \ + ((descr)->header.private_futex \ + = THREAD_GETMEM (THREAD_SELF, header.private_futex)) +#endif #endif /* __ASSEMBLER__ */ --- libc/nptl/allocatestack.c.jj 2007-05-24 18:01:04.000000000 +0200 +++ libc/nptl/allocatestack.c 2007-05-24 18:36:45.000000000 +0200 @@ -376,10 +376,9 @@ allocate_stack (const struct pthread_att __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1; #endif -#ifndef __ASSUME_PRIVATE_FUTEX +#ifdef THREAD_COPY_PRIVATE_FUTEX /* The thread must know when private futexes are supported. */ - pd->header.private_futex = THREAD_GETMEM (THREAD_SELF, - header.private_futex); + THREAD_COPY_PRIVATE_FUTEX (pd); #endif #ifdef NEED_DL_SYSINFO @@ -516,10 +515,9 @@ allocate_stack (const struct pthread_att __pthread_multiple_threads = *__libc_multiple_threads_ptr = 1; #endif -#ifndef __ASSUME_PRIVATE_FUTEX +#ifdef THREAD_COPY_PRIVATE_FUTEX /* The thread must know when private futexes are supported. */ - pd->header.private_futex = THREAD_GETMEM (THREAD_SELF, - header.private_futex); + THREAD_COPY_PRIVATE_FUTEX (pd); #endif #ifdef NEED_DL_SYSINFO --- libc/nptl/init.c.jj 2007-05-24 16:41:06.000000000 +0200 +++ libc/nptl/init.c 2007-05-24 18:42:53.000000000 +0200 @@ -276,7 +276,7 @@ __pthread_initialize_minimal_internal (v #endif set_robust_list_not_avail (); -#ifndef __ASSUME_PRIVATE_FUTEX +#ifdef THREAD_SET_PRIVATE_FUTEX /* Private futexes are always used (at least internally) so that doing the test once this early is beneficial. */ { @@ -284,7 +284,7 @@ __pthread_initialize_minimal_internal (v res = INTERNAL_SYSCALL (futex, err, 3, &word, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1); if (!INTERNAL_SYSCALL_ERROR_P (res, err)) - THREAD_SETMEM (pd, header.private_futex, FUTEX_PRIVATE_FLAG); + THREAD_SET_PRIVATE_FUTEX (pd, FUTEX_PRIVATE_FLAG); } #endif Jakub