RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:17:44 +00:00
Code Issues Activity Actions

LibC: Remove reinterpret_cast in pthread_mutex_{try,}lock

Browse source
This commit is contained in:
Gunnar Beutner 2021-06-02 08:50:08 +02:00 • committed by Andreas Kling
parent 11fa3e4f92
commit 5ca1d4289b
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibC/pthread_integration.cpp
View file

@ -93,11 +93,10 @@ int pthread_self() __attribute__((weak, alias("__pthread_self")));
int __pthread_mutex_lock(pthread_mutex_t* mutex) int __pthread_mutex_lock(pthread_mutex_t* mutex)
{ {
auto& atomic = reinterpret_cast<Atomic<u32>&>(mutex->lock);
pthread_t this_thread = __pthread_self(); pthread_t this_thread = __pthread_self();
for (;;) { for (;;) {
u32 expected = false; u32 expected = 0;
if (!atomic.compare_exchange_strong(expected, true, AK::memory_order_acq_rel)) { if (!AK::atomic_compare_exchange_strong(&mutex->lock, expected, 1u, AK::memory_order_acq_rel)) {
if (mutex->type == __PTHREAD_MUTEX_RECURSIVE && mutex->owner == this_thread) { if (mutex->type == __PTHREAD_MUTEX_RECURSIVE && mutex->owner == this_thread) {
mutex->level++; mutex->level++;
return 0; return 0;
@ -128,9 +127,8 @@ int pthread_mutex_unlock(pthread_mutex_t*) __attribute__((weak, alias("__pthread
int __pthread_mutex_trylock(pthread_mutex_t* mutex) int __pthread_mutex_trylock(pthread_mutex_t* mutex)
{ {
auto& atomic = reinterpret_cast<Atomic<u32>&>(mutex->lock); u32 expected = 0;
u32 expected = false; if (!AK::atomic_compare_exchange_strong(&mutex->lock, expected, 1u, AK::memory_order_acq_rel)) {
if (!atomic.compare_exchange_strong(expected, true, AK::memory_order_acq_rel)) {
if (mutex->type == __PTHREAD_MUTEX_RECURSIVE && mutex->owner == pthread_self()) { if (mutex->type == __PTHREAD_MUTEX_RECURSIVE && mutex->owner == pthread_self()) {
mutex->level++; mutex->level++;
return 0; return 0;