This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
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 <jakub@redhat.com>
* 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
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |