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

kernel: Tweak some mutex functions.

Browse Source 
* Remove code duplication.
 * Make _mutex_trylock work in non-KDEBUG kernels. This should fix
   spurious failures to lock in drivers compiled for KDEBUG kernels
   running under non-KDEBUG kernels.
This commit is contained in:
Augustin Cavalier
2019-03-09 12:02:00 -05:00
parent 10baa577a9
commit c32137f3fd
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/locks/lock.cpp
+4 -5
View File
@@ -652,10 +652,7 @@ mutex_switch_lock(mutex* from, mutex* to)
{ {
InterruptsSpinLocker locker(to->lock); InterruptsSpinLocker locker(to->lock);
#if !KDEBUG mutex_unlock(from);
if (atomic_add(&from->count, 1) < -1)
#endif
_mutex_unlock(from);
return mutex_lock_threads_locked(to, &locker); return mutex_lock_threads_locked(to, &locker);
} }
@@ -802,8 +799,10 @@ _mutex_trylock(mutex* lock)
lock->holder = thread_get_current_thread_id(); lock->holder = thread_get_current_thread_id();
return B_OK; return B_OK;
} }
#endif
return B_WOULD_BLOCK; return B_WOULD_BLOCK;
#else
return mutex_trylock(lock);
#endif
} }