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

Update. 

2003-02-06  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Remove wrong
	but inactive generalization.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Likewise.
	Minor optimization, remove one instruction.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Likewise.
This commit is contained in:
Ulrich Drepper 2003-02-06 08:38:56 +00:00
parent 432cf458f9
commit 11090a992d
5 changed files with 23 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nptl/ChangeLog
View File

@ -1,3 +1,12 @@
2003-02-06 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Remove wrong
but inactive generalization.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Likewise.
Minor optimization, remove one instruction.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Likewise.
2003-02-04 Martin Schwidefsky <schwidefsky@de.ibm.com> 2003-02-04 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/fork.c: Correct order of parameters. * sysdeps/unix/sysv/linux/s390/fork.c: Correct order of parameters.

19
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
View File

@ -44,9 +44,6 @@ __pthread_cond_broadcast:
pushl %ebx pushl %ebx
movl 12(%esp), %ebx movl 12(%esp), %ebx
#if cond_lock != 0
addl $cond_lock, %ebx
#endif
/* Get internal lock. */ /* Get internal lock. */
movl $1, %eax movl $1, %eax
@ -72,22 +69,16 @@ __pthread_cond_broadcast:
movl %eax, wakeup_seq+4(%ebx) movl %eax, wakeup_seq+4(%ebx)
/* Wake up all threads. */ /* Wake up all threads. */
addl $wakeup_seq-cond_lock, %ebx addl $wakeup_seq, %ebx
movl $FUTEX_WAKE, %ecx movl $FUTEX_WAKE, %ecx
xorl %esi, %esi xorl %esi, %esi
movl $SYS_futex, %eax movl $SYS_futex, %eax
movl $0x7fffffff, %edx movl $0x7fffffff, %edx
ENTER_KERNEL ENTER_KERNEL
subl $wakeup_seq-cond_lock, %ebx
/* Unlock. */ /* Unlock. */
4: LOCK 4: LOCK
#if cond_lock == 0 decl cond_lock-wakeup_seq(%ebx)
decl (%ebx)
#else
decl cond_lock(%ebx)
#endif
jne 5f jne 5f
6: xorl %eax, %eax 6: xorl %eax, %eax
@ -107,11 +98,7 @@ __pthread_cond_broadcast:
/* Unlock in loop requires waekup. */ /* Unlock in loop requires waekup. */
5: 5:
#if cond_lock == 0 leal cond_lock-wakeup_seq(%ebx), %eax
movl %ebx, %eax
#else
leal cond_lock(%ebx), %eax
#endif
call __lll_mutex_unlock_wake call __lll_mutex_unlock_wake
jmp 6b jmp 6b
.size __pthread_cond_broadcast, .-__pthread_cond_broadcast .size __pthread_cond_broadcast, .-__pthread_cond_broadcast

19
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
View File

@ -42,9 +42,6 @@ __pthread_cond_signal:
pushl %esi pushl %esi
pushl %ebx pushl %ebx
#if cond_lock != 0
addl $cond_lock, %ebx
#endif
movl 12(%esp), %ebx movl 12(%esp), %ebx
@ -72,22 +69,16 @@ __pthread_cond_signal:
adcl $0, wakeup_seq+4(%ebx) adcl $0, wakeup_seq+4(%ebx)
/* Wake up one thread. */ /* Wake up one thread. */
addl $wakeup_seq-cond_lock, %ebx addl $wakeup_seq, %ebx
movl $FUTEX_WAKE, %ecx movl $FUTEX_WAKE, %ecx
xorl %esi, %esi xorl %esi, %esi
movl $SYS_futex, %eax movl $SYS_futex, %eax
movl %ecx, %edx /* movl $1, %edx */ movl %ecx, %edx /* movl $1, %edx */
ENTER_KERNEL ENTER_KERNEL
subl $wakeup_seq-cond_lock, %ebx
/* Unlock. */ /* Unlock. */
4: LOCK 4: LOCK
#if cond_lock == 0 decl cond_lock-wakeup_seq(%ebx)
decl (%ebx)
#else
decl cond_lock(%ebx)
#endif
jne 5f jne 5f
6: xorl %eax, %eax 6: xorl %eax, %eax
@ -107,11 +98,7 @@ __pthread_cond_signal:
/* Unlock in loop requires waekup. */ /* Unlock in loop requires waekup. */
5: 5:
#if cond_lock == 0 leal cond_lock-wakeup_seq(%ebx), %eax
movl %ebx, %eax
#else
leal cond_lock(%ebx), %eax
#endif
call __lll_mutex_unlock_wake call __lll_mutex_unlock_wake
jmp 6b jmp 6b
.size __pthread_cond_signal, .-__pthread_cond_signal .size __pthread_cond_signal, .-__pthread_cond_signal

7
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
View File

@ -51,9 +51,6 @@ __pthread_cond_timedwait:
movl 20(%esp), %ebx movl 20(%esp), %ebx
movl 28(%esp), %ebp movl 28(%esp), %ebp
#if cond_lock != 0
addl $cond_lock, %ebx
#endif
/* Get internal lock. */ /* Get internal lock. */
movl $1, %eax movl $1, %eax
@ -134,10 +131,10 @@ __pthread_cond_timedwait:
leal 4(%esp), %esi leal 4(%esp), %esi
xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */ xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */
movl %edi, %edx movl %edi, %edx
addl $wakeup_seq-cond_lock, %ebx addl $wakeup_seq, %ebx
movl $SYS_futex, %eax movl $SYS_futex, %eax
ENTER_KERNEL ENTER_KERNEL
subl $wakeup_seq-cond_lock, %ebx subl $wakeup_seq, %ebx
movl %eax, %esi movl %eax, %esi
call __pthread_disable_asynccancel call __pthread_disable_asynccancel

14
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
View File

@ -41,9 +41,6 @@
__condvar_cleanup: __condvar_cleanup:
pushl %ebx pushl %ebx
movl 8(%esp), %ebx movl 8(%esp), %ebx
#if cond_lock != 0
addl $cond_lock, %ebx
#endif
/* Get internal lock. */ /* Get internal lock. */
movl $1, %eax movl $1, %eax
@ -70,7 +67,11 @@ __condvar_cleanup:
adcl $0, woken_seq+4(%ebx) adcl $0, woken_seq+4(%ebx)
LOCK LOCK
#if cond_lock == 0
decl (%ebx) decl (%ebx)
#else
decl cond_lock(%ebx)
#endif
je 2f je 2f
#if cond_lock == 0 #if cond_lock == 0
movl %ebx, %eax movl %ebx, %eax
@ -96,9 +97,6 @@ __pthread_cond_wait:
xorl %esi, %esi xorl %esi, %esi
movl 16(%esp), %ebx movl 16(%esp), %ebx
#if cond_lock != 0
addl $cond_lock, %ebx
#endif
/* Get internal lock. */ /* Get internal lock. */
movl $1, %eax movl $1, %eax
@ -153,10 +151,10 @@ __pthread_cond_wait:
movl %esi, %ecx /* movl $FUTEX_WAIT, %ecx */ movl %esi, %ecx /* movl $FUTEX_WAIT, %ecx */
movl %edi, %edx movl %edi, %edx
addl $wakeup_seq-cond_lock, %ebx addl $wakeup_seq, %ebx
movl $SYS_futex, %eax movl $SYS_futex, %eax
ENTER_KERNEL ENTER_KERNEL
subl $wakeup_seq-cond_lock, %ebx subl $wakeup_seq, %ebx
call __pthread_disable_asynccancel call __pthread_disable_asynccancel