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

libkernelland_emu: Sync _rw_lock_{read|write}_unlock API.

Browse Source 
The threadsLocked parameter was removed from the kernel API.
This commit is contained in:
Michael Lotz
2014-10-21 00:04:24 +02:00
parent 4101aaedc7
commit 893367cf30
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/add-ons/kernel/kernelland_emu/lock.cpp
+21 -6
View File
@@ -43,6 +43,9 @@ struct rw_lock_waiter {
#define RW_LOCK_FLAG_OWNS_NAME RW_LOCK_FLAG_CLONE_NAME #define RW_LOCK_FLAG_OWNS_NAME RW_LOCK_FLAG_CLONE_NAME
static void _rw_lock_read_unlock_threads_locked(rw_lock* lock);
static void _rw_lock_write_unlock_threads_locked(rw_lock* lock);
static status_t _mutex_lock_threads_locked(mutex* lock); static status_t _mutex_lock_threads_locked(mutex* lock);
static void _mutex_unlock_threads_locked(mutex* lock); static void _mutex_unlock_threads_locked(mutex* lock);
@@ -456,10 +459,16 @@ _rw_lock_read_lock_with_timeout(rw_lock* lock, uint32 timeoutFlags,
void void
_rw_lock_read_unlock(rw_lock* lock, bool threadsLocked) _rw_lock_read_unlock(rw_lock* lock)
{ {
AutoLocker<ThreadSpinlock> locker(sThreadSpinlock, false, !threadsLocked); AutoLocker<ThreadSpinlock> locker(sThreadSpinlock);
_rw_lock_read_unlock_threads_locked(lock);
}
static void
_rw_lock_read_unlock_threads_locked(rw_lock* lock)
{
// If we're still holding the write lock or if there are other readers, // If we're still holding the write lock or if there are other readers,
// no-one can be woken up. // no-one can be woken up.
if (lock->holder == find_thread(NULL)) { if (lock->holder == find_thread(NULL)) {
@@ -521,10 +530,16 @@ rw_lock_write_lock(rw_lock* lock)
void void
_rw_lock_write_unlock(rw_lock* lock, bool threadsLocked) _rw_lock_write_unlock(rw_lock* lock)
{ {
AutoLocker<ThreadSpinlock> locker(sThreadSpinlock, false, !threadsLocked); AutoLocker<ThreadSpinlock> locker(sThreadSpinlock);
_rw_lock_write_unlock_threads_locked(lock);
}
static void
_rw_lock_write_unlock_threads_locked(rw_lock* lock)
{
if (find_thread(NULL) != lock->holder) { if (find_thread(NULL) != lock->holder) {
panic("rw_lock_write_unlock(): lock %p not write-locked by this thread", panic("rw_lock_write_unlock(): lock %p not write-locked by this thread",
lock); lock);
@@ -650,11 +665,11 @@ mutex_switch_from_read_lock(rw_lock* from, mutex* to)
AutoLocker<ThreadSpinlock> locker(sThreadSpinlock); AutoLocker<ThreadSpinlock> locker(sThreadSpinlock);
#if KDEBUG_RW_LOCK_DEBUG #if KDEBUG_RW_LOCK_DEBUG
_rw_lock_write_unlock(from, true); _rw_lock_write_unlock_threads_locked(from);
#else #else
int32 oldCount = atomic_add(&from->count, -1); int32 oldCount = atomic_add(&from->count, -1);
if (oldCount >= RW_LOCK_WRITER_COUNT_BASE) if (oldCount >= RW_LOCK_WRITER_COUNT_BASE)
_rw_lock_read_unlock(from, true); _rw_lock_read_unlock_threads_locked(from);
#endif #endif
return _mutex_lock_threads_locked(to); return _mutex_lock_threads_locked(to);