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

Update. 

* sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S: Don't define
	LOCK is already defined.  Don't define __lll_mutex_timedlock_wait
	for libc.so.
	* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S: Only
	define LOCK here (if UP is not defined).  The actual code is in
	lowlevelmutex.S.
This commit is contained in:
Ulrich Drepper 2003-03-10 22:27:01 +00:00
parent 9356d063df
commit fad48d9e2d
3 changed files with 22 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nptl/ChangeLog
View File

@ -1,5 +1,12 @@
2003-03-10 Ulrich Drepper <drepper@redhat.com> 2003-03-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S: Don't define
LOCK is already defined. Don't define __lll_mutex_timedlock_wait
for libc.so.
* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S: Only
define LOCK here (if UP is not defined). The actual code is in
lowlevelmutex.S.
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Don't define * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Don't define
LOCK is already defined. Don't define lll_unlock_wake_cb and LOCK is already defined. Don't define lll_unlock_wake_cb and
__lll_timedwait_tid for libc.so. __lll_timedwait_tid for libc.so.

75
nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevelmutex.S
View File

@ -17,75 +17,14 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> /* In libc.so we do not unconditionally use the lock prefix. Only if
the application is using threads. */
.text
#define SYS_gettimeofday __NR_gettimeofday
#define SYS_futex 240
#define FUTEX_WAIT 0
#define FUTEX_WAKE 1
#define EWOULDBLOCK 11
#define EINVAL 22
#define ETIMEDOUT 110
.globl __lll_mutex_lock_wait
.type __lll_mutex_lock_wait,@function
.hidden __lll_mutex_lock_wait
.align 16
__lll_mutex_lock_wait:
pushl %esi
pushl %ebx
pushl %edx
movl %ecx, %ebx
xorl %esi, %esi /* No timeout. */
xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */
1:
leal 1(%eax), %edx /* account for the preceeded xadd. */
movl $SYS_futex, %eax
ENTER_KERNEL
movl $1, %eax
#ifndef UP #ifndef UP
cmpl $0, %gs:MULTIPLE_THREADS_OFFSET # define LOCK \
je,pt 0f cmpl $0, %gs:MULTIPLE_THREADS_OFFSET; \
lock je,pt 0f; \
lock; \
0: 0:
#endif #endif
xaddl %eax, (%ebx)
testl %eax, %eax
jne 1b
movl $2, (%ebx) #include "lowlevelmutex.S"
popl %edx
popl %ebx
popl %esi
ret
.size __lll_mutex_lock_wait,.-__lll_mutex_lock_wait
.globl __lll_mutex_unlock_wake
.type __lll_mutex_unlock_wake,@function
.hidden __lll_mutex_unlock_wake
.align 16
__lll_mutex_unlock_wake:
pushl %ebx
pushl %ecx
pushl %edx
movl %eax, %ebx
movl $FUTEX_WAKE, %ecx
movl $1, %edx /* Wake one thread. */
movl $SYS_futex, %eax
movl $0, (%ebx)
ENTER_KERNEL
popl %edx
popl %ecx
popl %ebx
ret
.size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake

12
nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S
View File

@ -21,10 +21,12 @@
.text .text
#ifdef UP #ifndef LOCK
# define LOCK # ifdef UP
#else # define LOCK
# define LOCK lock # else
# define LOCK lock
# endif
#endif #endif
#define SYS_gettimeofday __NR_gettimeofday #define SYS_gettimeofday __NR_gettimeofday
@ -69,6 +71,7 @@ __lll_mutex_lock_wait:
.size __lll_mutex_lock_wait,.-__lll_mutex_lock_wait .size __lll_mutex_lock_wait,.-__lll_mutex_lock_wait
#ifdef NOT_IN_libc
.globl __lll_mutex_timedlock_wait .globl __lll_mutex_timedlock_wait
.type __lll_mutex_timedlock_wait,@function .type __lll_mutex_timedlock_wait,@function
.hidden __lll_mutex_timedlock_wait .hidden __lll_mutex_timedlock_wait
@ -148,6 +151,7 @@ __lll_mutex_timedlock_wait:
5: movl $ETIMEDOUT, %eax 5: movl $ETIMEDOUT, %eax
jmp 6b jmp 6b
.size __lll_mutex_timedlock_wait,.-__lll_mutex_timedlock_wait .size __lll_mutex_timedlock_wait,.-__lll_mutex_timedlock_wait
#endif
.globl __lll_mutex_unlock_wake .globl __lll_mutex_unlock_wake