Initial revision
2002-11-26 Ulrich Drepper <drepper@redhat.com>
* allocatestack.c (queue_stack): Don't remove stack from list here.
Do it in the caller. Correct condition to prematurely terminate
loop to free stacks.
(__deallocate_stack): Remove stack from list here.
2002-11-26 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-stack1.
* tst-stack1.c: New file.
* allocatestack.c (allocate_stack): Initialize the TCB on a user
provided stack.
* pthread_attr_getstack.c: Return bottom of the thread area.
2002-11-25 Ulrich Drepper <drepper@redhat.com>
* Makefile (libpthread-routines): Add pt-allocrtsig and
pthread_kill_other_threads.
* pt-allocrtsig.c: New file.
* pthread_kill_other_threads.c: New file.
* sysdeps/unix/sysv/linux/allocrtsig.c: Add additional aliases for
all three functions.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Remove
allocrtsig.
* sysdeps/unix/sysv/linux/Versions (libc:GLIBC_PRIVATE): Export
__libc_current_sigrtmin_private, __libc_current_sigrtmax_private,
and __libc_allocate_rtsig_private.
* Versions (libpthread): Export pthread_kill_other_threads_np,
__libc_current_sigrtmin, and __libc_current_sigrtmax.
2002-11-24 Ulrich Drepper <drepper@redhat.com>
* allocatestack.c (allocate_stack): stackaddr in attribute points to
the end of the stack. Adjust computations.
When mprotect call fails dequeue stack and free it.
* pthread_attr_setstack.c: Store top of the stack in stackaddr
attribute.
* pthread_getattr_np.c: Likewise.
* descr.h (IS_DETACHED): Add some more parenthesis to prevent
surprises.
2002-11-23 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/pthread.h (pthread_self): __THROW must come before
attribute definitions. Patch by Luca Barbieri <ldb@ldb.ods.org>.
2002-11-22 Ulrich Drepper <drepper@redhat.com>
* pthread_getspecific.c: Optimize access to first 2nd-level array.
* pthread_setspecific.c: Likewise.
2002-11-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/createthread.c: Remove CLONE_ flags
definitions. Get them from the official place.
* sysdeps/unix/sysv/linux/i386/fork.c: Likewise.
* sysdeps/unix/sysv/linux/i386/createthread.c: Update CLONE_* flags.
Use new CLONE_ flags in clone() calls.
* sysdeps/unix/sysv/linux/fork.c: Use ARCH_FORK to actually fork.
* sysdeps/unix/sysv/linux/i386/fork.c: New file.
* Versions: Add pthread_* functions for libc.
* forward.c: New file.
* sysdeps/pthread/Makefile (libpthread-sysdeps_routines): Add
errno-loc.
* herrno.c: New file.
* res.c: New file.
* Makefile (libpthread-routines): Remove sem_post, sem_wait,
sem_trywait, and sem_timedwait. Add herrno and res.
* sem_init.c: Don't initialize lock and waiters members.
* sem_open.c: Likewise.
* sem_post.c: Removed.
* sem_wait.c: Removed.
* sem_trywait.c: Removed.
* sem_timedwait.c: Removed.
* sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S: Complete rewrite.
Includes full implementations of sem_post, sem_wait, sem_trywait,
and sem_timedwait.
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h (lll_sem_post): Adjust
for new implementation.
* sysdeps/unix/sysv/linux/internaltypes.h (struct sem): Remove lock
and waiters fields.
* tst-sem3.c: Improve error message.
* tst-signal3.c: Likewise.
* init.c (__pthread_initialize_minimal): Use set_tid_address syscall
to tell the kernel about the termination futex and to initialize tid
member. Don't initialize main_thread.
* descr.h (struct pthread): Remove main_thread member.
* cancelllation.c (__do_cancel): Remove code handling main thread.
The main thread is not special anymore.
* allocatestack.c (__reclaim_stacks): Mark stacks as unused. Add
size of the stacks to stack_cache_actsize.
* pt-readv.c: Add missing "defined".
* pt-sigwait.c: Likewise.
* pt-writev.c: Likewise.
2002-11-09 Ulrich Drepper <drepper@redhat.com>
* Versions: Export __connect from libpthread.
Patch by Luca Barbieri <ldb@ldb.ods.org>.
* Makefile (libpthread-routines): Add pt-raise.
* sysdeps/unix/sysv/linux/raise.c: New file.
* sysdeps/unix/sysv/linux/pt-raise.c: New file.
* sysdeps/generic/pt-raise.c: New file.
* pthread_cond_init.c: Initialize all data elements of the condvar
structure. Patch by Luca Barbieri <ldb@ldb.ods.org>.
* pthread_attr_init.c: Actually implement 2.0 compatibility version.
* pthread_create.c: Likewise.
* Makefile (tests): Add tst-key1, tst-key2, tst-key3.
* tst-key1.c: New file.
* tst-key2.c: New file.
* tst-key3.c: New file.
* Versions: Export pthread_detach for version GLIBC_2.0.
Reported by Saurabh Desai <sdesai@austin.ibm.com>.
2002-11-08 Ulrich Drepper <drepper@redhat.com>
* pthread_key_create.c: Terminate search after an unused key was found.
Patch by Luca Barbieri <ldb@ldb.ods.org>.
* sysdeps/unix/sysv/linux/i386/pthread_once.S: Return zero.
Patch by Luca Barbieri <ldb@ldb.ods.org>.
2002-10-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S: Use slow generic
dynamic lookup for errno in PIC.
* allocatestack.c (get_cached_stack): Rearrange code slightly to
release the stack lock as soon as possible.
Call _dl_allocate_tls_init for TCB from the cache to re-initialize
the static TLS block.
(allocate_stack): Call _dl_allocate_tls_init for user-provided stack.
* cancellation.c: Renamed from cancelation.c.
* Makefile: Adjust accordingly.
* pthreadP.h (CANCELLATION_P): Renamed from CANCELATION_P.
* cleanup_defer.c: Use CANCELLATION_P.
* pthread_testcancel.c: Likewise.
* descr.h: Fix spelling in comments.
* init.c: Likewise.
* pthread_getattr_np.c: Likewise.
* pthread_getschedparam.c: Likewise.
* pthread_setschedparam.c: Likewise.
* Versions: Likewise.
* pt-pselect.c: New file.
* Makefile (libpthread-routines): Add pt-pselect.
* Versions: Add pselect.
* tst-cancel4.c: New file.
* Makefile (tests): Add tst-cancel4.
2002-10-09 Ulrich Drepper <drepper@redhat.com>
* pthread_mutex_lock.c: Always record lock ownership.
* pthread_mutex_timedlock.c: Likewise.
* pthread_mutex_trylock.c: Likewise.
* pt-readv.c: New file.
* pt-writev.c: New file.
* pt-creat.c: New file.
* pt-msgrcv.c: New file.
* pt-msgsnd.c: New file.
* pt-poll.c: New file.
* pt-select.c: New file.
* pt-sigpause.c: New file.
* pt-sigsuspend.c: New file.
* pt-sigwait.c: New file.
* pt-sigwaitinfo.c: New file.
* pt-waitid.c: New file.
* Makefile (libpthread-routines): Add pt-readv, pt-writev, pt-creat,
pt-msgrcv, pt-msgsnd, pt-poll, pt-select, pt-sigpause, pt-sigsuspend,
pt-sigwait, pt-sigwaitinfo, and pt-waitid.
* Versions: Add all the new functions.
* tst-exit1.c: New file.
* Makefile (tests): Add tst-exit1.
* sem_timedwait.c: Minor optimization for more optimal fastpath.
2002-10-08 Ulrich Drepper <drepper@redhat.com>
* pt-fcntl.c: Only enable asynchronous cancellation for F_SETLKW.
* pthread_join.c: Enable asynchronous cancellation around lll_wait_tid
call. pthread_join is an official cancellation point.
* pthread_timedjoin.c: Likewise.
* pthread_cond_wait.c: Revert order in which internal lock are dropped
and the condvar's mutex are retrieved.
* pthread_cond_timedwait.c: Likewise.
Reported by dice@saros.East.Sun.COM.
2002-10-07 Ulrich Drepper <drepper@redhat.com>
* pthreadP.h: Cut out all type definitions and move them...
* sysdeps/unix/sysv/linux/internaltypes.h: ...here. New file.
* pthreadP.h: Include <internaltypes.h>.
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h (lll_sem_post): Little
performance tweaks.
* sem_trywait.c: Shuffle #includes around to get right order.
* sem_timedwait.c: Likewise.
* sem_post.c: Likewise.
* sem_wait.c: Likewise.
* nptl 0.3 released.
* Makefile (tests): Add tst-signal3.
* tst-signal3.c: New file.
2002-10-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h: Tell the compiler that
the asms modify the sem object.
(__lll_sem_timedwait): Now takes struct sem* as first parameter.
* sysdeps/unix/sysv/linux/i386/bits/semaphore.h (sem_t): Don't expose
the actual members.
* pthreadP.h (struct sem): New type. Actual semaphore type.
* semaphoreP.h: Include pthreadP.h.
* sem_getvalue.c: Adjust to sem_t change.
* sem_init.c: Likewise.
* sem_open.c: Likewise.
* sem_post.c: Likewise.
* sem_timedwait.c: Likewise.
* sem_trywait.c: Likewise.
* sem_wait.c: Likewise.
2002-10-04 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-basic2, tst-exec1, tst-exec3, tst-exec3.
* tst-basic2.c: New file.
* tst-exec1.c: New file.
* tst-exec2.c: New file.
* tst-exec3.c: New file.
* tst-fork1.c: Remove extra */.
* nptl 0.2 released. The API for IA-32 is complete.
2002-11-26 22:50:54 +00:00
|
|
|
/* Copyright (C) 2002 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
|
|
|
|
.text
|
|
|
|
|
|
|
|
#define SYS_gettimeofday __NR_gettimeofday
|
|
|
|
#define SYS_futex 240
|
|
|
|
#define FUTEX_WAIT 0
|
|
|
|
#define FUTEX_WAKE 1
|
|
|
|
|
|
|
|
#define EAGAIN 11
|
|
|
|
#define EDEADLK 35
|
|
|
|
#define ETIMEDOUT 110
|
|
|
|
|
|
|
|
/* Offsets in the pthread_rwlock_t structure. */
|
|
|
|
#define MUTEX 0
|
|
|
|
#define NR_READERS 4
|
|
|
|
#define READERS_WAKEUP 8
|
|
|
|
#define WRITERS_WAKEUP 12
|
|
|
|
#define READERS_QUEUED 16
|
|
|
|
#define WRITERS_QUEUED 20
|
|
|
|
#define FLAGS 24
|
|
|
|
#define WRITER 28
|
|
|
|
|
|
|
|
#ifndef UP
|
|
|
|
# define LOCK lock
|
|
|
|
#else
|
|
|
|
# define LOCK
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
.globl __pthread_rwlock_rdlock
|
|
|
|
.type __pthread_rwlock_rdlock,@function
|
|
|
|
.align 16
|
|
|
|
__pthread_rwlock_rdlock:
|
|
|
|
pushl %esi
|
|
|
|
pushl %ebx
|
|
|
|
|
|
|
|
xorl %esi, %esi
|
|
|
|
xorl %edx, %edx
|
|
|
|
movl 12(%esp), %ebx
|
|
|
|
|
|
|
|
/* Get the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebx)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 1f
|
|
|
|
|
|
|
|
2: movl WRITER(%ebx), %eax
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 14f
|
|
|
|
cmp $0, WRITERS_QUEUED(%ebx)
|
|
|
|
je 5f
|
|
|
|
cmpl $0, FLAGS(%ebx)
|
|
|
|
je 5f
|
|
|
|
|
|
|
|
3: incl READERS_QUEUED(%ebx)
|
|
|
|
je 4f
|
|
|
|
|
|
|
|
LOCK
|
|
|
|
decl MUTEX(%ebx)
|
|
|
|
jne 10f
|
|
|
|
|
|
|
|
11: addl $READERS_WAKEUP-MUTEX, %ebx
|
|
|
|
movl %esi, %ecx /* movl $FUTEX_WAIT, %ecx */
|
|
|
|
movl $SYS_futex, %eax
|
|
|
|
int $0x80
|
|
|
|
|
|
|
|
subl $READERS_WAKEUP-MUTEX, %ebx
|
|
|
|
|
|
|
|
/* Reget the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebx)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 12f
|
|
|
|
|
|
|
|
13: decl READERS_QUEUED(%ebx)
|
|
|
|
jne 2b
|
|
|
|
movl $0, READERS_WAKEUP(%ebx)
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
5: xorl %ecx, %ecx
|
|
|
|
incl NR_READERS(%ebx)
|
|
|
|
je 8f
|
|
|
|
9: LOCK
|
|
|
|
decl MUTEX(%ebx)
|
|
|
|
jne 6f
|
|
|
|
7:
|
|
|
|
|
|
|
|
movl %ecx, %eax
|
|
|
|
popl %ebx
|
|
|
|
popl %esi
|
|
|
|
ret
|
|
|
|
|
|
|
|
1: movl %ebx, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
14: cmpl %gs:8, %eax
|
|
|
|
jne 3b
|
|
|
|
/* Deadlock detected. */
|
|
|
|
movl $EDEADLK, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
6: movl %ebx, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 7b
|
|
|
|
|
|
|
|
/* Overflow. */
|
|
|
|
8: decl NR_READERS(%ebx)
|
|
|
|
movl $EAGAIN, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
/* Overflow. */
|
|
|
|
4: decl READERS_QUEUED(%ebx)
|
|
|
|
movl $EAGAIN, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
10: movl %ebx, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 11b
|
|
|
|
|
|
|
|
12: movl %ebx, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 13b
|
|
|
|
.size __pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock
|
|
|
|
|
|
|
|
.globl pthread_rwlock_rdlock
|
|
|
|
pthread_rwlock_rdlock = __pthread_rwlock_rdlock
|
|
|
|
|
|
|
|
|
|
|
|
.globl pthread_rwlock_timedrdlock
|
|
|
|
.type pthread_rwlock_timedrdlock,@function
|
|
|
|
.align 16
|
|
|
|
pthread_rwlock_timedrdlock:
|
|
|
|
pushl %esi
|
|
|
|
pushl %edi
|
|
|
|
pushl %ebx
|
|
|
|
pushl %ebp
|
|
|
|
subl $8, %esp
|
|
|
|
|
|
|
|
movl 28(%esp), %ebp
|
|
|
|
movl 32(%esp), %edi
|
|
|
|
|
|
|
|
/* Get the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebp)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 1f
|
|
|
|
|
|
|
|
2: movl WRITER(%ebp), %eax
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 14f
|
|
|
|
cmp $0, WRITERS_QUEUED(%ebp)
|
|
|
|
je 5f
|
|
|
|
cmpl $0, FLAGS(%ebp)
|
|
|
|
je 5f
|
|
|
|
|
|
|
|
3: incl READERS_QUEUED(%ebp)
|
|
|
|
je 4f
|
|
|
|
|
|
|
|
LOCK
|
|
|
|
decl MUTEX(%ebp)
|
|
|
|
jne 10f
|
|
|
|
|
|
|
|
/* Get current time. */
|
|
|
|
movl %esp, %ebx
|
|
|
|
xorl %ecx, %ecx
|
|
|
|
movl $SYS_gettimeofday, %eax
|
|
|
|
int $0x80
|
|
|
|
|
|
|
|
/* Compute relative timeout. */
|
|
|
|
movl 4(%esp), %eax
|
|
|
|
movl $1000, %edx
|
|
|
|
mul %edx /* Milli seconds to nano seconds. */
|
|
|
|
movl (%edi), %ecx
|
|
|
|
movl 4(%edi), %edx
|
|
|
|
subl (%esp), %ecx
|
|
|
|
subl %eax, %edx
|
|
|
|
jns 15f
|
|
|
|
addl $1000000000, %edx
|
|
|
|
decl %ecx
|
|
|
|
15: testl %ecx, %ecx
|
|
|
|
js 16f /* Time is already up. */
|
|
|
|
|
|
|
|
/* Futex call. */
|
|
|
|
movl %ecx, (%esp) /* Store relative timeout. */
|
|
|
|
movl %edx, 4(%esp)
|
|
|
|
xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */
|
|
|
|
movl %esp, %esi
|
|
|
|
movl %ecx, %edx
|
|
|
|
leal READERS_WAKEUP(%ebp), %ebx
|
|
|
|
movl $SYS_futex, %eax
|
|
|
|
int $0x80
|
|
|
|
movl %eax, %edx
|
|
|
|
17:
|
|
|
|
|
|
|
|
/* Reget the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebp)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 12f
|
|
|
|
|
|
|
|
13: cmpl $-ETIMEDOUT, %ecx
|
|
|
|
je 18f
|
|
|
|
decl READERS_QUEUED(%ebp)
|
|
|
|
jne 2b
|
|
|
|
movl $0, READERS_WAKEUP(%ebp)
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
|
|
|
|
5: xorl %ecx, %ecx
|
|
|
|
incl NR_READERS(%ebp)
|
|
|
|
je 8f
|
|
|
|
9: LOCK
|
|
|
|
decl MUTEX(%ebp)
|
|
|
|
jne 6f
|
|
|
|
|
|
|
|
7: movl %ecx, %eax
|
|
|
|
|
|
|
|
addl $8, %esp
|
|
|
|
popl %ebp
|
|
|
|
popl %ebx
|
|
|
|
popl %edi
|
|
|
|
popl %esi
|
|
|
|
ret
|
|
|
|
|
|
|
|
1: movl %ebp, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
14: cmpl %gs:8, %eax
|
|
|
|
jne 3b
|
|
|
|
movl $EDEADLK, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
6: movl %ebp, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 7b
|
|
|
|
|
|
|
|
/* Overflow. */
|
|
|
|
8: decl NR_READERS(%ebp)
|
|
|
|
movl $EAGAIN, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
/* Overflow. */
|
|
|
|
4: decl READERS_QUEUED(%ebp)
|
|
|
|
movl $EAGAIN, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
10: movl %ebp, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 11b
|
|
|
|
|
|
|
|
12: movl %ebx, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 13b
|
|
|
|
|
|
|
|
16: movl $-ETIMEDOUT, %ecx
|
|
|
|
jmp 17b
|
|
|
|
|
|
|
|
18: movl $ETIMEDOUT, %ecx
|
|
|
|
jmp 9b
|
|
|
|
.size pthread_rwlock_timedrdlock,.-pthread_rwlock_timedrdlock
|
|
|
|
|
|
|
|
|
|
|
|
.globl __pthread_rwlock_wrlock
|
|
|
|
.type __pthread_rwlock_wrlock,@function
|
|
|
|
.align 16
|
|
|
|
__pthread_rwlock_wrlock:
|
|
|
|
pushl %esi
|
|
|
|
pushl %ebx
|
|
|
|
|
|
|
|
xorl %esi, %esi
|
|
|
|
xorl %edx, %edx
|
|
|
|
movl 12(%esp), %ebx
|
|
|
|
|
|
|
|
/* Get the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebx)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 1f
|
|
|
|
|
|
|
|
2: movl WRITER(%ebx), %eax
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 14f
|
|
|
|
cmp $0, NR_READERS(%ebx)
|
|
|
|
je 5f
|
|
|
|
|
|
|
|
3: incl WRITERS_QUEUED(%ebx)
|
|
|
|
je 4f
|
|
|
|
|
|
|
|
LOCK
|
|
|
|
decl MUTEX(%ebx)
|
|
|
|
jne 10f
|
|
|
|
|
|
|
|
11: addl $WRITERS_WAKEUP-MUTEX, %ebx
|
|
|
|
movl %esi, %ecx /* movl $FUTEX_WAIT, %ecx */
|
|
|
|
movl $SYS_futex, %eax
|
|
|
|
int $0x80
|
|
|
|
|
|
|
|
subl $WRITERS_WAKEUP-MUTEX, %ebx
|
|
|
|
|
|
|
|
/* Reget the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebx)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 12f
|
|
|
|
|
|
|
|
13: decl WRITERS_QUEUED(%ebx)
|
|
|
|
movl $0, WRITERS_WAKEUP(%ebx)
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
5: xorl %ecx, %ecx
|
|
|
|
movl %gs:8, %eax
|
|
|
|
movl %eax, WRITER(%ebx)
|
|
|
|
9: LOCK
|
|
|
|
decl MUTEX(%ebx)
|
|
|
|
jne 6f
|
|
|
|
7:
|
|
|
|
|
|
|
|
movl %ecx, %eax
|
|
|
|
popl %ebx
|
|
|
|
popl %esi
|
|
|
|
ret
|
|
|
|
|
|
|
|
1: movl %ebx, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
14: cmpl %gs:8, %eax
|
|
|
|
jne 3b
|
|
|
|
movl $EDEADLK, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
6: movl %ebx, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 7b
|
|
|
|
|
|
|
|
4: decl WRITERS_QUEUED(%ebx)
|
|
|
|
movl $EAGAIN, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
10: movl %ebx, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 11b
|
|
|
|
|
|
|
|
12: movl %ebx, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 13b
|
|
|
|
.size __pthread_rwlock_wrlock,.-__pthread_rwlock_wrlock
|
|
|
|
|
|
|
|
.globl pthread_rwlock_wrlock
|
|
|
|
pthread_rwlock_wrlock = __pthread_rwlock_wrlock
|
|
|
|
|
|
|
|
|
|
|
|
.globl pthread_rwlock_timedwrlock
|
|
|
|
.type pthread_rwlock_timedwrlock,@function
|
|
|
|
.align 16
|
|
|
|
pthread_rwlock_timedwrlock:
|
|
|
|
pushl %esi
|
|
|
|
pushl %edi
|
|
|
|
pushl %ebx
|
|
|
|
pushl %ebp
|
|
|
|
subl $8, %esp
|
|
|
|
|
|
|
|
movl 28(%esp), %ebp
|
|
|
|
movl 32(%esp), %edi
|
|
|
|
|
|
|
|
/* Get the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebp)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 1f
|
|
|
|
|
|
|
|
2: movl WRITER(%ebp), %eax
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 14f
|
|
|
|
cmp $0, NR_READERS(%ebp)
|
|
|
|
je 5f
|
|
|
|
|
|
|
|
3: incl WRITERS_QUEUED(%ebp)
|
|
|
|
je 4f
|
|
|
|
|
|
|
|
LOCK
|
|
|
|
decl MUTEX(%ebp)
|
|
|
|
jne 10f
|
|
|
|
|
|
|
|
/* Get current time. */
|
|
|
|
movl %esp, %ebx
|
|
|
|
xorl %ecx, %ecx
|
|
|
|
movl $SYS_gettimeofday, %eax
|
|
|
|
int $0x80
|
|
|
|
|
|
|
|
/* Compute relative timeout. */
|
|
|
|
movl 4(%esp), %eax
|
|
|
|
movl $1000, %edx
|
|
|
|
mul %edx /* Milli seconds to nano seconds. */
|
|
|
|
movl (%edi), %ecx
|
|
|
|
movl 4(%edi), %edx
|
|
|
|
subl (%esp), %ecx
|
|
|
|
subl %eax, %edx
|
|
|
|
jns 15f
|
|
|
|
addl $1000000000, %edx
|
|
|
|
decl %ecx
|
|
|
|
15: testl %ecx, %ecx
|
|
|
|
js 16f /* Time is already up. */
|
|
|
|
|
|
|
|
/* Futex call. */
|
|
|
|
movl %ecx, (%esp) /* Store relative timeout. */
|
|
|
|
movl %edx, 4(%esp)
|
|
|
|
xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */
|
|
|
|
movl %esp, %esi
|
|
|
|
movl %ecx, %edx
|
|
|
|
leal WRITERS_WAKEUP(%ebp), %ebx
|
|
|
|
movl $SYS_futex, %eax
|
|
|
|
int $0x80
|
|
|
|
movl %eax, %edx
|
|
|
|
17:
|
|
|
|
|
|
|
|
/* Reget the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%ebp)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 12f
|
|
|
|
|
|
|
|
13: cmpl $-ETIMEDOUT, %ecx
|
|
|
|
je 18f
|
|
|
|
decl WRITERS_QUEUED(%ebp)
|
|
|
|
movl $0, WRITERS_WAKEUP(%ebp)
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
|
|
|
|
5: xorl %ecx, %ecx
|
|
|
|
movl %gs:8, %eax
|
|
|
|
movl %eax, WRITER(%ebp)
|
|
|
|
9: LOCK
|
|
|
|
decl MUTEX(%ebp)
|
|
|
|
jne 6f
|
|
|
|
|
|
|
|
7: movl %ecx, %eax
|
|
|
|
|
|
|
|
addl $8, %esp
|
|
|
|
popl %ebp
|
|
|
|
popl %ebx
|
|
|
|
popl %edi
|
|
|
|
popl %esi
|
|
|
|
ret
|
|
|
|
|
|
|
|
1: movl %ebp, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
14: cmpl %gs:8, %eax
|
|
|
|
jne 3b
|
|
|
|
movl $EDEADLK, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
6: movl %ebp, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 7b
|
|
|
|
|
|
|
|
/* Overflow. */
|
|
|
|
4: decl WRITERS_QUEUED(%ebp)
|
|
|
|
movl $EAGAIN, %ecx
|
|
|
|
jmp 9b
|
|
|
|
|
|
|
|
10: movl %ebp, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 11b
|
|
|
|
|
|
|
|
12: movl %ebx, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 13b
|
|
|
|
|
|
|
|
16: movl $-ETIMEDOUT, %ecx
|
|
|
|
jmp 17b
|
|
|
|
|
|
|
|
18: movl $ETIMEDOUT, %ecx
|
|
|
|
jmp 9b
|
|
|
|
.size pthread_rwlock_timedwrlock,.-pthread_rwlock_timedwrlock
|
|
|
|
|
|
|
|
.globl __pthread_rwlock_unlock
|
|
|
|
.type __pthread_rwlock_unlock,@function
|
|
|
|
.align 16
|
|
|
|
__pthread_rwlock_unlock:
|
|
|
|
pushl %ebx
|
|
|
|
pushl %esi
|
|
|
|
pushl %edi
|
|
|
|
|
|
|
|
xorl %esi, %esi
|
|
|
|
xorl %edx, %edx
|
|
|
|
movl 16(%esp), %edi
|
|
|
|
|
|
|
|
/* Get the lock. */
|
|
|
|
movl $1, %eax
|
|
|
|
LOCK
|
|
|
|
xaddl %eax, MUTEX(%edi)
|
|
|
|
testl %eax, %eax
|
|
|
|
jne 1f
|
|
|
|
|
|
|
|
2: cmpl $0, WRITER(%edi)
|
|
|
|
jne 5f
|
|
|
|
decl NR_READERS(%edi)
|
|
|
|
jnz 6f
|
|
|
|
|
|
|
|
5: movl $0, WRITER(%edi)
|
|
|
|
|
|
|
|
movl $0x7fffffff, %edx
|
|
|
|
leal READERS_WAKEUP(%edi), %ebx
|
|
|
|
movl $1, %ecx
|
|
|
|
leal WRITERS_WAKEUP(%edi), %eax
|
|
|
|
cmpl $0, WRITERS_QUEUED(%edi)
|
2002-11-28 23:52:24 +00:00
|
|
|
#ifdef HAVE_CMOV
|
|
|
|
cmovnel %ecx, %edx
|
|
|
|
cmovnel %eax, %ebx
|
|
|
|
#else
|
|
|
|
je 0f
|
|
|
|
movl %ecx, %edx
|
|
|
|
movl %eax, %ebx
|
|
|
|
0:
|
|
|
|
#endif
|
Initial revision
2002-11-26 Ulrich Drepper <drepper@redhat.com>
* allocatestack.c (queue_stack): Don't remove stack from list here.
Do it in the caller. Correct condition to prematurely terminate
loop to free stacks.
(__deallocate_stack): Remove stack from list here.
2002-11-26 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-stack1.
* tst-stack1.c: New file.
* allocatestack.c (allocate_stack): Initialize the TCB on a user
provided stack.
* pthread_attr_getstack.c: Return bottom of the thread area.
2002-11-25 Ulrich Drepper <drepper@redhat.com>
* Makefile (libpthread-routines): Add pt-allocrtsig and
pthread_kill_other_threads.
* pt-allocrtsig.c: New file.
* pthread_kill_other_threads.c: New file.
* sysdeps/unix/sysv/linux/allocrtsig.c: Add additional aliases for
all three functions.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Remove
allocrtsig.
* sysdeps/unix/sysv/linux/Versions (libc:GLIBC_PRIVATE): Export
__libc_current_sigrtmin_private, __libc_current_sigrtmax_private,
and __libc_allocate_rtsig_private.
* Versions (libpthread): Export pthread_kill_other_threads_np,
__libc_current_sigrtmin, and __libc_current_sigrtmax.
2002-11-24 Ulrich Drepper <drepper@redhat.com>
* allocatestack.c (allocate_stack): stackaddr in attribute points to
the end of the stack. Adjust computations.
When mprotect call fails dequeue stack and free it.
* pthread_attr_setstack.c: Store top of the stack in stackaddr
attribute.
* pthread_getattr_np.c: Likewise.
* descr.h (IS_DETACHED): Add some more parenthesis to prevent
surprises.
2002-11-23 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/pthread.h (pthread_self): __THROW must come before
attribute definitions. Patch by Luca Barbieri <ldb@ldb.ods.org>.
2002-11-22 Ulrich Drepper <drepper@redhat.com>
* pthread_getspecific.c: Optimize access to first 2nd-level array.
* pthread_setspecific.c: Likewise.
2002-11-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/createthread.c: Remove CLONE_ flags
definitions. Get them from the official place.
* sysdeps/unix/sysv/linux/i386/fork.c: Likewise.
* sysdeps/unix/sysv/linux/i386/createthread.c: Update CLONE_* flags.
Use new CLONE_ flags in clone() calls.
* sysdeps/unix/sysv/linux/fork.c: Use ARCH_FORK to actually fork.
* sysdeps/unix/sysv/linux/i386/fork.c: New file.
* Versions: Add pthread_* functions for libc.
* forward.c: New file.
* sysdeps/pthread/Makefile (libpthread-sysdeps_routines): Add
errno-loc.
* herrno.c: New file.
* res.c: New file.
* Makefile (libpthread-routines): Remove sem_post, sem_wait,
sem_trywait, and sem_timedwait. Add herrno and res.
* sem_init.c: Don't initialize lock and waiters members.
* sem_open.c: Likewise.
* sem_post.c: Removed.
* sem_wait.c: Removed.
* sem_trywait.c: Removed.
* sem_timedwait.c: Removed.
* sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S: Complete rewrite.
Includes full implementations of sem_post, sem_wait, sem_trywait,
and sem_timedwait.
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h (lll_sem_post): Adjust
for new implementation.
* sysdeps/unix/sysv/linux/internaltypes.h (struct sem): Remove lock
and waiters fields.
* tst-sem3.c: Improve error message.
* tst-signal3.c: Likewise.
* init.c (__pthread_initialize_minimal): Use set_tid_address syscall
to tell the kernel about the termination futex and to initialize tid
member. Don't initialize main_thread.
* descr.h (struct pthread): Remove main_thread member.
* cancelllation.c (__do_cancel): Remove code handling main thread.
The main thread is not special anymore.
* allocatestack.c (__reclaim_stacks): Mark stacks as unused. Add
size of the stacks to stack_cache_actsize.
* pt-readv.c: Add missing "defined".
* pt-sigwait.c: Likewise.
* pt-writev.c: Likewise.
2002-11-09 Ulrich Drepper <drepper@redhat.com>
* Versions: Export __connect from libpthread.
Patch by Luca Barbieri <ldb@ldb.ods.org>.
* Makefile (libpthread-routines): Add pt-raise.
* sysdeps/unix/sysv/linux/raise.c: New file.
* sysdeps/unix/sysv/linux/pt-raise.c: New file.
* sysdeps/generic/pt-raise.c: New file.
* pthread_cond_init.c: Initialize all data elements of the condvar
structure. Patch by Luca Barbieri <ldb@ldb.ods.org>.
* pthread_attr_init.c: Actually implement 2.0 compatibility version.
* pthread_create.c: Likewise.
* Makefile (tests): Add tst-key1, tst-key2, tst-key3.
* tst-key1.c: New file.
* tst-key2.c: New file.
* tst-key3.c: New file.
* Versions: Export pthread_detach for version GLIBC_2.0.
Reported by Saurabh Desai <sdesai@austin.ibm.com>.
2002-11-08 Ulrich Drepper <drepper@redhat.com>
* pthread_key_create.c: Terminate search after an unused key was found.
Patch by Luca Barbieri <ldb@ldb.ods.org>.
* sysdeps/unix/sysv/linux/i386/pthread_once.S: Return zero.
Patch by Luca Barbieri <ldb@ldb.ods.org>.
2002-10-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/lowlevelsem.S: Use slow generic
dynamic lookup for errno in PIC.
* allocatestack.c (get_cached_stack): Rearrange code slightly to
release the stack lock as soon as possible.
Call _dl_allocate_tls_init for TCB from the cache to re-initialize
the static TLS block.
(allocate_stack): Call _dl_allocate_tls_init for user-provided stack.
* cancellation.c: Renamed from cancelation.c.
* Makefile: Adjust accordingly.
* pthreadP.h (CANCELLATION_P): Renamed from CANCELATION_P.
* cleanup_defer.c: Use CANCELLATION_P.
* pthread_testcancel.c: Likewise.
* descr.h: Fix spelling in comments.
* init.c: Likewise.
* pthread_getattr_np.c: Likewise.
* pthread_getschedparam.c: Likewise.
* pthread_setschedparam.c: Likewise.
* Versions: Likewise.
* pt-pselect.c: New file.
* Makefile (libpthread-routines): Add pt-pselect.
* Versions: Add pselect.
* tst-cancel4.c: New file.
* Makefile (tests): Add tst-cancel4.
2002-10-09 Ulrich Drepper <drepper@redhat.com>
* pthread_mutex_lock.c: Always record lock ownership.
* pthread_mutex_timedlock.c: Likewise.
* pthread_mutex_trylock.c: Likewise.
* pt-readv.c: New file.
* pt-writev.c: New file.
* pt-creat.c: New file.
* pt-msgrcv.c: New file.
* pt-msgsnd.c: New file.
* pt-poll.c: New file.
* pt-select.c: New file.
* pt-sigpause.c: New file.
* pt-sigsuspend.c: New file.
* pt-sigwait.c: New file.
* pt-sigwaitinfo.c: New file.
* pt-waitid.c: New file.
* Makefile (libpthread-routines): Add pt-readv, pt-writev, pt-creat,
pt-msgrcv, pt-msgsnd, pt-poll, pt-select, pt-sigpause, pt-sigsuspend,
pt-sigwait, pt-sigwaitinfo, and pt-waitid.
* Versions: Add all the new functions.
* tst-exit1.c: New file.
* Makefile (tests): Add tst-exit1.
* sem_timedwait.c: Minor optimization for more optimal fastpath.
2002-10-08 Ulrich Drepper <drepper@redhat.com>
* pt-fcntl.c: Only enable asynchronous cancellation for F_SETLKW.
* pthread_join.c: Enable asynchronous cancellation around lll_wait_tid
call. pthread_join is an official cancellation point.
* pthread_timedjoin.c: Likewise.
* pthread_cond_wait.c: Revert order in which internal lock are dropped
and the condvar's mutex are retrieved.
* pthread_cond_timedwait.c: Likewise.
Reported by dice@saros.East.Sun.COM.
2002-10-07 Ulrich Drepper <drepper@redhat.com>
* pthreadP.h: Cut out all type definitions and move them...
* sysdeps/unix/sysv/linux/internaltypes.h: ...here. New file.
* pthreadP.h: Include <internaltypes.h>.
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h (lll_sem_post): Little
performance tweaks.
* sem_trywait.c: Shuffle #includes around to get right order.
* sem_timedwait.c: Likewise.
* sem_post.c: Likewise.
* sem_wait.c: Likewise.
* nptl 0.3 released.
* Makefile (tests): Add tst-signal3.
* tst-signal3.c: New file.
2002-10-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h: Tell the compiler that
the asms modify the sem object.
(__lll_sem_timedwait): Now takes struct sem* as first parameter.
* sysdeps/unix/sysv/linux/i386/bits/semaphore.h (sem_t): Don't expose
the actual members.
* pthreadP.h (struct sem): New type. Actual semaphore type.
* semaphoreP.h: Include pthreadP.h.
* sem_getvalue.c: Adjust to sem_t change.
* sem_init.c: Likewise.
* sem_open.c: Likewise.
* sem_post.c: Likewise.
* sem_timedwait.c: Likewise.
* sem_trywait.c: Likewise.
* sem_wait.c: Likewise.
2002-10-04 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-basic2, tst-exec1, tst-exec3, tst-exec3.
* tst-basic2.c: New file.
* tst-exec1.c: New file.
* tst-exec2.c: New file.
* tst-exec3.c: New file.
* tst-fork1.c: Remove extra */.
* nptl 0.2 released. The API for IA-32 is complete.
2002-11-26 22:50:54 +00:00
|
|
|
movl $SYS_futex, %eax
|
|
|
|
int $0x80
|
|
|
|
|
|
|
|
6: LOCK
|
|
|
|
decl MUTEX(%edi)
|
|
|
|
jne 3f
|
|
|
|
|
|
|
|
4: xorl %eax, %eax
|
|
|
|
popl %edi
|
|
|
|
popl %esi
|
|
|
|
popl %ebx
|
|
|
|
ret
|
|
|
|
|
|
|
|
1: movl %edi, %ecx
|
|
|
|
call __lll_mutex_lock_wait
|
|
|
|
jmp 2b
|
|
|
|
|
|
|
|
3: movl %edi, %eax
|
|
|
|
call __lll_mutex_unlock_wake
|
|
|
|
jmp 4b
|
|
|
|
|
|
|
|
.size __pthread_rwlock_unlock,.-__pthread_rwlock_unlock
|
|
|
|
|
|
|
|
.globl pthread_rwlock_unlock
|
|
|
|
pthread_rwlock_unlock = __pthread_rwlock_unlock
|