summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/dietlibc/libpthread/pthread_spinlock.c
diff options
context:
space:
mode:
authorMystery Man <unknown@mandriva.org>2003-05-06 13:11:49 +0000
committerMystery Man <unknown@mandriva.org>2003-05-06 13:11:49 +0000
commit3f5d21d90abbd16f16ab69aec1e1a1853a93fd18 (patch)
tree3d9f5a32303a8d97b4b457949e64bb42b4850ea9 /mdk-stage1/dietlibc/libpthread/pthread_spinlock.c
parent327bd24f8e4291bd1882de1990dd7339f781a9cb (diff)
downloaddrakx-backup-do-not-use-850b61624412652eee04fc35ee5cb43e8fd723fa.tar
drakx-backup-do-not-use-850b61624412652eee04fc35ee5cb43e8fd723fa.tar.gz
drakx-backup-do-not-use-850b61624412652eee04fc35ee5cb43e8fd723fa.tar.bz2
drakx-backup-do-not-use-850b61624412652eee04fc35ee5cb43e8fd723fa.tar.xz
drakx-backup-do-not-use-850b61624412652eee04fc35ee5cb43e8fd723fa.zip
This commit was manufactured by cvs2svn to create tag 'R9_0-AMD64'.R9_0-AMD64
Diffstat (limited to 'mdk-stage1/dietlibc/libpthread/pthread_spinlock.c')
-rw-r--r--mdk-stage1/dietlibc/libpthread/pthread_spinlock.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/mdk-stage1/dietlibc/libpthread/pthread_spinlock.c b/mdk-stage1/dietlibc/libpthread/pthread_spinlock.c
index 449782adf..463c186bd 100644
--- a/mdk-stage1/dietlibc/libpthread/pthread_spinlock.c
+++ b/mdk-stage1/dietlibc/libpthread/pthread_spinlock.c
@@ -2,12 +2,12 @@
#include <pthread.h>
#include "thread_internal.h"
-static void __pthread_acquire(int * spinlock)
+void __pthread_lock(struct _pthread_fastlock * lock)
{
int cnt = 0;
struct timespec tm;
- while (__testandset(spinlock)) {
+ while (__testandset(&lock->__spinlock)) {
if (cnt < MAX_SPIN_COUNT) {
sched_yield();
cnt++;
@@ -20,11 +20,6 @@ static void __pthread_acquire(int * spinlock)
}
}
-void __pthread_lock(struct _pthread_fastlock * lock)
-{
- __pthread_acquire(&lock->__spinlock);
-}
-
int __pthread_trylock(struct _pthread_fastlock * lock)
{
return __testandset(&lock->__spinlock);
@@ -32,7 +27,8 @@ int __pthread_trylock(struct _pthread_fastlock * lock)
int __pthread_unlock(struct _pthread_fastlock * lock)
{
- return (lock->__spinlock = 0);
+ lock->__spinlock = PTHREAD_SPIN_UNLOCKED;
+ return 0;
}