qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2004-06-13  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h (pthread_cond_t):
	Add __data.__futex field, reshuffle __data.__clock.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
	(__pthread_cond_signal): Increment __futex at the same time as
	__wakeup_seq or __total_seq.  Pass address of __futex instead of
	address of low 32-bits of __wakeup_seq to futex syscall.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
	(__pthread_cond_wait): Likewise.  Pass __futex value from before
	releasing internal lock to FUTEX_WAIT.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
	(__pthread_cond_timedwait): Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
	(FUTEX_CMP_REQUEUE): Define.
	(__pthread_cond_broadcast): Set __futex to 2 * __total_seq.
	Use FUTEX_CMP_REQUEUE operation instead of FUTEX_REQUEUE.
	Pass __futex value from before the unlock and __futex address instead
	of address of low 32-bits of __wakeup_seq to futex syscall.
	Fallback to FUTEX_WAKE all on any errors.
This commit is contained in:
Ulrich Drepper 2004-06-17 23:58:15 +00:00
parent c7be5c15e2
commit 7c37008632
7 changed files with 86 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nptl/ChangeLog
View File

@ -1,3 +1,24 @@
2004-06-13 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h (pthread_cond_t):
Add __data.__futex field, reshuffle __data.__clock.
* sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
(__pthread_cond_signal): Increment __futex at the same time as
__wakeup_seq or __total_seq. Pass address of __futex instead of
address of low 32-bits of __wakeup_seq to futex syscall.
* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
(__pthread_cond_wait): Likewise. Pass __futex value from before
releasing internal lock to FUTEX_WAIT.
* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
(__pthread_cond_timedwait): Likewise.
* sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
(FUTEX_CMP_REQUEUE): Define.
(__pthread_cond_broadcast): Set __futex to 2 * __total_seq.
Use FUTEX_CMP_REQUEUE operation instead of FUTEX_REQUEUE.
Pass __futex value from before the unlock and __futex address instead
of address of low 32-bits of __wakeup_seq to futex syscall.
Fallback to FUTEX_WAKE all on any errors.
2004-06-08 Jakub Jelinek <jakub@redhat.com> 2004-06-08 Jakub Jelinek <jakub@redhat.com>
* pthread_mutexattr_getpshared.c (pthread_mutex_getpshared): Fix * pthread_mutexattr_getpshared.c (pthread_mutex_getpshared): Fix

3
nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
View File

@ -77,11 +77,12 @@ typedef union
struct struct
{ {
int __lock; int __lock;
int __clock; unsigned int __futex;
unsigned long long int __total_seq; unsigned long long int __total_seq;
unsigned long long int __wakeup_seq; unsigned long long int __wakeup_seq;
unsigned long long int __woken_seq; unsigned long long int __woken_seq;
void *__mutex; void *__mutex;
int __clock;
unsigned int __broadcast_seq; unsigned int __broadcast_seq;
} __data; } __data;
char __size[__SIZEOF_PTHREAD_COND_T]; char __size[__SIZEOF_PTHREAD_COND_T];

30
nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
View File

@ -26,6 +26,7 @@
#define FUTEX_WAIT 0 #define FUTEX_WAIT 0
#define FUTEX_WAKE 1 #define FUTEX_WAKE 1
#define FUTEX_REQUEUE 3 #define FUTEX_REQUEUE 3
#define FUTEX_CMP_REQUEUE 4
#define EINVAL 22 #define EINVAL 22
@ -36,6 +37,7 @@
.type __pthread_cond_broadcast, @function .type __pthread_cond_broadcast, @function
.align 5 .align 5
__pthread_cond_broadcast: __pthread_cond_broadcast:
mov.l r10, @-r15
mov.l r9, @-r15 mov.l r9, @-r15
mov.l r8, @-r15 mov.l r8, @-r15
sts.l pr, @-r15 sts.l pr, @-r15
@ -72,6 +74,9 @@ __pthread_cond_broadcast:
mov.l @(broadcast_seq,r8), r2 mov.l @(broadcast_seq,r8), r2
add #1, r2 add #1, r2
mov.l r2, @(broadcast_seq,r8) mov.l r2, @(broadcast_seq,r8)
add r1, r1
mov r1, r10
mov.l r10, @(cond_futex,r8)
/* Get the address of the mutex used. */ /* Get the address of the mutex used. */
mov.l @(dep_mutex,r8), r9 mov.l @(dep_mutex,r8), r9
@ -91,10 +96,10 @@ __pthread_cond_broadcast:
cmp/eq r0, r9 cmp/eq r0, r9
mov r8, r4 mov r8, r4
bt/s 9f bt/s 9f
add #wakeup_seq, r4 add #cond_futex, r4
/* Wake up all threads. */ /* Wake up all threads. */
mov #FUTEX_REQUEUE, r5 mov #FUTEX_CMP_REQUEUE, r5
mov #1, r6 mov #1, r6
mov #-1, r7 mov #-1, r7
shlr r7 /* r7 = 0x7fffffff */ shlr r7 /* r7 = 0x7fffffff */
@ -102,17 +107,31 @@ __pthread_cond_broadcast:
# if MUTEX_FUTEX != 0 # if MUTEX_FUTEX != 0
add #MUTEX_FUTEX, r0 add #MUTEX_FUTEX, r0
# endif # endif
mov r10, r1
mov #SYS_futex, r3 mov #SYS_futex, r3
extu.b r3, r3 extu.b r3, r3
trapa #0x15 trapa #0x16
SYSCALL_INST_PAD SYSCALL_INST_PAD
/* For any kind of error, which mainly is EAGAIN, we try again
with WAKE. The general test also covers running on old
kernels. */
mov r0, r1
mov #-12, r2
shad r2, r1
not r1, r1
tst r1, r1
mov r8, r4
bt/s 9f
add #cond_futex, r4
10: 10:
mov #0, r0 mov #0, r0
lds.l @r15+, pr lds.l @r15+, pr
mov.l @r15+, r8 mov.l @r15+, r8
mov.l @r15+, r9
rts rts
mov.l @r15+, r9 mov.l @r15+, r10
4: 4:
/* Unlock. */ /* Unlock. */
@ -127,8 +146,9 @@ __pthread_cond_broadcast:
mov #0, r0 mov #0, r0
lds.l @r15+, pr lds.l @r15+, pr
mov.l @r15+, r8 mov.l @r15+, r8
mov.l @r15+, r9
rts rts
mov.l @r15+, r9 mov.l @r15+, r10
1: 1:
/* Initial locking failed. */ /* Initial locking failed. */

5
nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
View File

@ -72,10 +72,13 @@ __pthread_cond_signal:
addc r3, r1 addc r3, r1
mov.l r0,@(wakeup_seq,r8) mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8) mov.l r1,@(wakeup_seq+4,r8)
mov.l @(cond_futex,r8),r0
add r2, r0
mov.l r0,@(cond_futex,r8)
/* Wake up one thread. */ /* Wake up one thread. */
mov r8, r4 mov r8, r4
add #wakeup_seq, r4 add #cond_futex, r4
mov #FUTEX_WAKE, r5 mov #FUTEX_WAKE, r5
mov #1, r6 mov #1, r6
mov #0, r7 mov #0, r7

18
nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
View File

@ -110,6 +110,10 @@ __pthread_cond_timedwait:
addc r3, r1 addc r3, r1
mov.l r0,@(total_seq,r8) mov.l r0,@(total_seq,r8)
mov.l r1,@(total_seq+4,r8) mov.l r1,@(total_seq+4,r8)
mov.l @(cond_futex,r8), r0
add r2, r0
mov.l r0, @(cond_futex,r8)
/* Get and store current wakeup_seq value. */ /* Get and store current wakeup_seq value. */
mov.l @(wakeup_seq,r8), r10 mov.l @(wakeup_seq,r8), r10
@ -150,6 +154,8 @@ __pthread_cond_timedwait:
/* Store relative timeout. */ /* Store relative timeout. */
mov.l r2, @(16,r15) mov.l r2, @(16,r15)
mov.l r3, @(20,r15) mov.l r3, @(20,r15)
mov.l @(cond_futex,r8), r1
mov.l r1, @(8,r15)
/* Unlock. */ /* Unlock. */
#if cond_lock != 0 #if cond_lock != 0
@ -172,9 +178,9 @@ __pthread_cond_timedwait:
mov r15, r7 mov r15, r7
add #16, r7 add #16, r7
mov #FUTEX_WAIT, r5 mov #FUTEX_WAIT, r5
mov r10, r6 mov.l @(8,r15), r6
mov r8, r4 mov r8, r4
add #wakeup_seq, r4 add #cond_futex, r4
mov #SYS_futex, r3 mov #SYS_futex, r3
extu.b r3, r3 extu.b r3, r3
trapa #0x14 trapa #0x14
@ -232,6 +238,9 @@ __pthread_cond_timedwait:
addc r3, r1 addc r3, r1
mov.l r0,@(wakeup_seq,r8) mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8) mov.l r1,@(wakeup_seq+4,r8)
mov.l @(cond_futex,r8),r0
add r2, r0
mov.l r0,@(cond_futex,r8)
mov #ETIMEDOUT, r0 mov #ETIMEDOUT, r0
bra 14f bra 14f
mov.l r0, @(24,r15) mov.l r0, @(24,r15)
@ -433,6 +442,9 @@ __condvar_tw_cleanup:
addc r3, r1 addc r3, r1
mov.l r0,@(wakeup_seq,r8) mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8) mov.l r1,@(wakeup_seq+4,r8)
mov.l @(cond_futex,r8),r0
add r2, r0
mov.l r0,@(cond_futex,r8)
clrt clrt
mov.l @(woken_seq,r8),r0 mov.l @(woken_seq,r8),r0
@ -463,7 +475,7 @@ __condvar_tw_cleanup:
2: 2:
/* Wake up all waiters to make sure no signal gets lost. */ /* Wake up all waiters to make sure no signal gets lost. */
mov r8, r4 mov r8, r4
add #wakeup_seq, r4 add #cond_futex, r4
mov #FUTEX_WAKE, r5 mov #FUTEX_WAKE, r5
mov #-1, r6 mov #-1, r6
shlr r6 /* r6 = 0x7fffffff */ shlr r6 /* r6 = 0x7fffffff */

15
nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
View File

@ -104,6 +104,9 @@ __pthread_cond_wait:
addc r3, r1 addc r3, r1
mov.l r0,@(total_seq,r8) mov.l r0,@(total_seq,r8)
mov.l r1,@(total_seq+4,r8) mov.l r1,@(total_seq+4,r8)
mov.l @(cond_futex,r8),r0
add r2, r0
mov.l r0,@(cond_futex,r8)
/* Get and store current wakeup_seq value. */ /* Get and store current wakeup_seq value. */
mov.l @(wakeup_seq,r8), r10 mov.l @(wakeup_seq,r8), r10
@ -112,6 +115,9 @@ __pthread_cond_wait:
mov.l r0, @(4,r15) mov.l r0, @(4,r15)
8: 8:
mov.l @(cond_futex,r8),r0
mov.l r0, @(8,r15)
/* Unlock. */ /* Unlock. */
#if cond_lock != 0 #if cond_lock != 0
DEC (@(cond_lock,r8), r2) DEC (@(cond_lock,r8), r2)
@ -130,9 +136,9 @@ __pthread_cond_wait:
mov #0, r7 mov #0, r7
mov #FUTEX_WAIT, r5 mov #FUTEX_WAIT, r5
mov r10, r6 mov.l @(8,r15), r6
mov r8, r4 mov r8, r4
add #wakeup_seq, r4 add #cond_futex, r4
mov #SYS_futex, r3 mov #SYS_futex, r3
extu.b r3, r3 extu.b r3, r3
trapa #0x14 trapa #0x14
@ -353,6 +359,9 @@ __condvar_w_cleanup:
addc r3, r1 addc r3, r1
mov.l r0,@(wakeup_seq,r8) mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8) mov.l r1,@(wakeup_seq+4,r8)
mov.l @(cond_futex,r8),r0
add r2, r0
mov.l r0,@(cond_futex,r8)
clrt clrt
mov.l @(woken_seq,r8),r0 mov.l @(woken_seq,r8),r0
@ -383,7 +392,7 @@ __condvar_w_cleanup:
2: 2:
/* Wake up all waiters to make sure no signal gets lost. */ /* Wake up all waiters to make sure no signal gets lost. */
mov r8, r4 mov r8, r4
add #wakeup_seq, r4 add #cond_futex, r4
mov #FUTEX_WAKE, r5 mov #FUTEX_WAKE, r5
mov #-1, r6 mov #-1, r6
shlr r6 /* r6 = 0x7fffffff */ shlr r6 /* r6 = 0x7fffffff */

17
sysdeps/ieee754/dbl-64/e_sqrt.c
View File

@ -41,7 +41,7 @@
#include "math_private.h" #include "math_private.h"
/*********************************************************************/ /*********************************************************************/
/* An ultimate aqrt routine. Given an IEEE double machine number x */ /* An ultimate sqrt routine. Given an IEEE double machine number x */
/* it computes the correctly rounded (to nearest) value of square */ /* it computes the correctly rounded (to nearest) value of square */
/* root of x. */ /* root of x. */
/*********************************************************************/ /*********************************************************************/
@ -52,7 +52,7 @@ double __ieee754_sqrt(double x) {
rt1 = 4.99999999495955425917856814202739E-01, rt1 = 4.99999999495955425917856814202739E-01,
rt2 = 3.75017500867345182581453026130850E-01, rt2 = 3.75017500867345182581453026130850E-01,
rt3 = 3.12523626554518656309172508769531E-01; rt3 = 3.12523626554518656309172508769531E-01;
static const double big = 134217728.0, big1 = 134217729.0; static const double big = 134217728.0;
double y,t,del,res,res1,hy,z,zz,p,hx,tx,ty,s; double y,t,del,res,res1,hy,z,zz,p,hx,tx,ty,s;
mynumber a,c={{0,0}}; mynumber a,c={{0,0}};
int4 k; int4 k;
@ -79,13 +79,10 @@ double __ieee754_sqrt(double x) {
} }
} }
else { else {
if (k>0x7ff00000) /* x -> infinity */ if ((k & 0x7ff00000) == 0x7ff00000)
return (big1-big1)/(big-big); return x*x+x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf, sqrt(-inf)=sNaN */
if (k<0x00100000) { /* x -> -infinity */ if (x==0) return x; /* sqrt(+0)=+0, sqrt(-0)=-0 */
if (x==0) return x; if (k<0) return (x-x)/(x-x); /* sqrt(-ve)=sNaN */
if (k<0) return (big1-big1)/(big-big); return tm256.x*__ieee754_sqrt(x*t512.x);
else return tm256.x*__ieee754_sqrt(x*t512.x);
}
else return (a.i[LOW_HALF]==0)?x:(big1-big1)/(big-big);
} }
} }