i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced the recursive lock implementation by the kernel implementation

Browse Source 
(slightly adjusted). It is completely based on mutexes, not needing any other
problematic features. Not sure why the previous implementation was doing it
differently.
This also adds the previously missing recursive_lock_trylock().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29462 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-03-09 01:48:28 +00:00
parent 98697fac69
commit 51ecdb00aa
1 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/add-ons/kernel/kernelland_emu/lock.cpp
+32 -54
View File
@@ -16,46 +16,28 @@
int32 int32
recursive_lock_get_recursion(recursive_lock *lock) recursive_lock_get_recursion(recursive_lock *lock)
{ {
thread_id thread = find_thread(NULL); if (RECURSIVE_LOCK_HOLDER(lock) == find_thread(NULL))
#if !KDEBUG
if (lock->holder == thread)
return lock->recursion; return lock->recursion;
#else
if (lock->lock.holder == thread)
return lock->recursion;
#endif
return -1; return -1;
} }
void void
recursive_lock_init_etc(recursive_lock *lock, const char *name, uint32 flags) recursive_lock_init(recursive_lock *lock, const char *name)
{ {
if (lock == NULL) mutex_init(&lock->lock, name != NULL ? name : "recursive lock");
return; RECURSIVE_LOCK_HOLDER(lock) = -1;
if (name == NULL)
name = "recursive lock";
#if !KDEBUG
lock->holder = -1;
#else
lock->lock.holder = -1;
#endif
lock->recursion = 0; lock->recursion = 0;
lock->lock.waiters = (mutex_waiter*)create_sem(1, name);
if ((sem_id)lock->lock.waiters < B_OK)
panic("recursive lock creation failed: %s\n", name);
} }
void void
recursive_lock_init(recursive_lock *lock, const char *name) recursive_lock_init_etc(recursive_lock *lock, const char *name, uint32 flags)
{ {
recursive_lock_init_etc(lock, name, 0); mutex_init_etc(&lock->lock, name != NULL ? name : "recursive lock", flags);
RECURSIVE_LOCK_HOLDER(lock) = -1;
lock->recursion = 0;
} }
@@ -65,8 +47,7 @@ recursive_lock_destroy(recursive_lock *lock)
if (lock == NULL) if (lock == NULL)
return; return;
delete_sem((sem_id)lock->lock.waiters); mutex_destroy(&lock->lock);
lock->lock.waiters = (mutex_waiter*)-1;
} }
@@ -75,29 +56,33 @@ recursive_lock_lock(recursive_lock *lock)
{ {
thread_id thread = find_thread(NULL); thread_id thread = find_thread(NULL);
if (thread != RECURSIVE_LOCK_HOLDER(lock)) {
mutex_lock(&lock->lock);
#if !KDEBUG #if !KDEBUG
if (thread != lock->holder) {
status_t status;
do {
status = acquire_sem((sem_id)lock->lock.waiters);
} while (status == B_INTERRUPTED);
if (status < B_OK)
return status;
lock->holder = thread; lock->holder = thread;
#endif
} }
#else
if (thread != lock->lock.holder) { lock->recursion++;
status_t status; return B_OK;
do { }
status = acquire_sem((sem_id)lock->lock.waiters);
} while (status == B_INTERRUPTED);
if (status < B_OK) status_t
recursive_lock_trylock(recursive_lock *lock)
{
thread_id thread = find_thread(NULL);
if (thread != RECURSIVE_LOCK_HOLDER(lock)) {
status_t status = mutex_trylock(&lock->lock);
if (status != B_OK)
return status; return status;
lock->lock.holder = thread; #if !KDEBUG
} lock->holder = thread;
#endif #endif
}
lock->recursion++; lock->recursion++;
return B_OK; return B_OK;
} }
@@ -106,21 +91,14 @@ recursive_lock_lock(recursive_lock *lock)
void void
recursive_lock_unlock(recursive_lock *lock) recursive_lock_unlock(recursive_lock *lock)
{ {
#if !KDEBUG if (find_thread(NULL) != RECURSIVE_LOCK_HOLDER(lock))
if (find_thread(NULL) != lock->holder)
panic("recursive_lock %p unlocked by non-holder thread!\n", lock); panic("recursive_lock %p unlocked by non-holder thread!\n", lock);
#else
if (find_thread(NULL) != lock->lock.holder)
panic("recursive_lock %p unlocked by non-holder thread!\n", lock);
#endif
if (--lock->recursion == 0) { if (--lock->recursion == 0) {
#if !KDEBUG #if !KDEBUG
lock->holder = -1; lock->holder = -1;
#else
lock->lock.holder = -1;
#endif #endif
release_sem_etc((sem_id)lock->lock.waiters, 1, 0); mutex_unlock(&lock->lock);
} }
} }